Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/114632
Change subject: Update usages of wikiversions.dat to wikiversions.json ...................................................................... Update usages of wikiversions.dat to wikiversions.json Change-Id: Ie1bb434126e62dae137df1f5d85e8bb7c5c4a014 --- M bin/scap-old M bin/scap-recompile M scap/tasks.py 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/scap refs/changes/32/114632/1 diff --git a/bin/scap-old b/bin/scap-old index d43c97c..1b83fe5 100755 --- a/bin/scap-old +++ b/bin/scap-old @@ -67,7 +67,7 @@ echo " done" # Update the current machine so that serialization works. -# Push wikiversions.dat changes so mwversionsinuse, set-group-write, +# Push wikiversions.json changes so mwversionsinuse, set-group-write, # and mwscript work with the right version of the files. /usr/local/bin/sync-common || die diff --git a/bin/scap-recompile b/bin/scap-recompile index 60a1d4c..3a08032 100644 --- a/bin/scap-recompile +++ b/bin/scap-recompile @@ -3,10 +3,10 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin: TERM=dumb -# wikiversions.dat just synced above +# wikiversions.json just synced above mwVersionNums=$(mwversionsinuse) if [ -z "$mwVersionNums" ]; then - echo "Unable to read wikiversions.dat or it is empty" + echo "Unable to read wikiversions.json or it is empty" exit 1 fi diff --git a/scap/tasks.py b/scap/tasks.py index 4377adb..859f746 100644 --- a/scap/tasks.py +++ b/scap/tasks.py @@ -114,7 +114,7 @@ check_php_syntax('%(MW_COMMON_SOURCE)s/multiversion' % args.cfg) # Update the current machine so that serialization works. Push - # wikiversions.dat changes so mwversionsinuse, set-group-write, + # wikiversions.json changes so mwversionsinuse, set-group-write, # and mwscript work with the right version of the files. sync_common(dict(args.cfg.items() + env.items())) @@ -154,6 +154,6 @@ t.mark('refreshWikiversionsCDB') utils.dsh('sudo -u mwdeploy rsync -l %(MW_RSYNC_HOST)s::common/' - 'wikiversions.{dat,cdb} %(MW_COMMON)s' % args.cfg, + 'wikiversions.{json,cdb} %(MW_COMMON)s' % args.cfg, 'mediawiki-installation') t.mark('rsync wikiversions') -- To view, visit https://gerrit.wikimedia.org/r/114632 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1bb434126e62dae137df1f5d85e8bb7c5c4a014 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/scap Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits