Skip to content

Commit ddd630c

Browse files
committed
Fix conflict
2 parents f9da507 + d7be4dc commit ddd630c

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

src/nexus/br/restore.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if md5sum -c /$BKP_FOLDER_NAME/$NEW_UUID/$BKP_FILE_NAME.md5; then
7373
# The MD5 sum matched
7474
./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
7575
./manage.sh migrate_baseurl -f --source-address=$SOURCE_URL --target-address=$TARGET_URL
76-
./manage.sh set_all_layers_metadata -d -i
76+
./manage.sh set_all_datasets_metadata -d -i
7777
else
7878
# The MD5 sum didn't match
7979
echo "-----------------------------------------------------"

src/package/support/geonode.updateip

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ sleep 5s
206206

207207
# Run updatelayers
208208
geonode updatelayers
209-
geonode set_all_layers_alternate
210-
geonode set_all_layers_metadata
209+
geonode set_all_datasets_alternate
210+
geonode set_all_datasets_metadata
211211

212212
# Run updatemaplayerip
213213
geonode updatemaplayerip

src/pavement.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ def sync(options):
432432
if 'django_celery_beat' in INSTALLED_APPS:
433433
sh("%s python -W ignore manage.py loaddata fixtures/django_celery_beat.json" % settings)
434434
sh("%s python -W ignore manage.py loaddata fixtures/nexus_harvesters.json" % settings)
435-
sh("%s python -W ignore manage.py set_all_layers_alternate" % settings)
435+
sh("%s python -W ignore manage.py set_all_datasets_alternate" % settings)
436436

437437

438438
@task

src/tasks.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,17 @@ def prepare(ctx):
233233
def fixtures(ctx):
234234
print("**************************fixtures********************************")
235235
ctx.run("python manage.py loaddata sample_admin \
236-
--settings={0}".format(_localsettings()), pty=True)
236+
--settings={0}".format(_localsettings()), pty=True)
237237
ctx.run("python manage.py loaddata /tmp/default_oauth_apps_docker.json \
238-
--settings={0}".format(_localsettings()), pty=True)
238+
--settings={0}".format(_localsettings()), pty=True)
239239
ctx.run("python manage.py loaddata /tmp/default_site.json \
240-
--settings={0}".format(_localsettings()), pty=True)
240+
--settings={0}".format(_localsettings()), pty=True)
241241
ctx.run("python manage.py loaddata /usr/src/nexus/fixtures/initial_data.json \
242-
--settings={0}".format(_localsettings()), pty=True)
242+
--settings={0}".format(_localsettings()), pty=True)
243243
ctx.run("python manage.py set_all_datasets_alternate \
244-
--settings={0}".format(_localsettings()), pty=True)
245-
# ctx.run("python manage.py set_all_datasets_metadata -d \
246-
# --settings={0}".format(_localsettings()), pty=True)
244+
--settings={0}".format(_localsettings()), pty=True)
245+
# ctx.run("python manage.py set_all_datasets_metadata -d \
246+
# --settings={0}".format(_localsettings()), pty=True)
247247

248248

249249
@task

0 commit comments

Comments
 (0)