Fix conflict

Author: meomancer

src/nexus/br/restore.sh

@@ -73,7 +73,7 @@ if md5sum -c /$BKP_FOLDER_NAME/$NEW_UUID/$BKP_FILE_NAME.md5; then
         # The MD5 sum matched
         ./manage.sh restore -l -n -f --backup-file /$BKP_FOLDER_NAME/$BKP_FILE_NAME.zip --recovery-file /$BKP_FOLDER_NAME/$NEW_UUID/$RECOVERY_FILE_NAME.zip
         ./manage.sh migrate_baseurl -f --source-address=$SOURCE_URL --target-address=$TARGET_URL
-        ./manage.sh set_all_layers_metadata -d -i
+        ./manage.sh set_all_datasets_metadata -d -i
     else
         # The MD5 sum didn't match
         echo "-----------------------------------------------------"

src/package/support/geonode.updateip

@@ -206,8 +206,8 @@ sleep 5s
 
 # Run updatelayers
 geonode updatelayers
-geonode set_all_layers_alternate
-geonode set_all_layers_metadata
+geonode set_all_datasets_alternate
+geonode set_all_datasets_metadata
 
 # Run updatemaplayerip
 geonode updatemaplayerip

src/pavement.py

@@ -432,7 +432,7 @@ def sync(options):
     if 'django_celery_beat' in INSTALLED_APPS:
         sh("%s python -W ignore manage.py loaddata fixtures/django_celery_beat.json" % settings)
     sh("%s python -W ignore manage.py loaddata fixtures/nexus_harvesters.json" % settings)
-    sh("%s python -W ignore manage.py set_all_layers_alternate" % settings)
+    sh("%s python -W ignore manage.py set_all_datasets_alternate" % settings)
 
 
 @task

src/tasks.py

@@ -233,17 +233,17 @@ def prepare(ctx):
 def fixtures(ctx):
     print("**************************fixtures********************************")
     ctx.run("python manage.py loaddata sample_admin \
-    --settings={0}".format(_localsettings()), pty=True)
+--settings={0}".format(_localsettings()), pty=True)
     ctx.run("python manage.py loaddata /tmp/default_oauth_apps_docker.json \
-    --settings={0}".format(_localsettings()), pty=True)
+--settings={0}".format(_localsettings()), pty=True)
     ctx.run("python manage.py loaddata /tmp/default_site.json \
-    --settings={0}".format(_localsettings()), pty=True)
+--settings={0}".format(_localsettings()), pty=True)
     ctx.run("python manage.py loaddata /usr/src/nexus/fixtures/initial_data.json \
-    --settings={0}".format(_localsettings()), pty=True)
+--settings={0}".format(_localsettings()), pty=True)
     ctx.run("python manage.py set_all_datasets_alternate \
-    --settings={0}".format(_localsettings()), pty=True)
-    #     ctx.run("python manage.py set_all_datasets_metadata -d \
-    # --settings={0}".format(_localsettings()), pty=True)
+--settings={0}".format(_localsettings()), pty=True)
+#     ctx.run("python manage.py set_all_datasets_metadata -d \
+# --settings={0}".format(_localsettings()), pty=True)
 
 
 @task