launchpad-reviewers team mailing list archive

[Colin Watson <mp+407692@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:fix-nightly into launchpad:master.

Commit message:
Fix nightly.sh for Python 3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/407692

We can no longer just run scripts with "python -S" and expect them to re-exec themselves with the correct Python version.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:fix-nightly into launchpad:master.

diff --git a/cronscripts/nightly.sh b/cronscripts/nightly.sh
index c22900c..9c4a674 100755
--- a/cronscripts/nightly.sh
+++ b/cronscripts/nightly.sh
@@ -24,28 +24,28 @@ cd `dirname $0`
 echo $(date): Grabbed lock >> $LOGFILE
 
 echo $(date): Expiring memberships >> $LOGFILE
-python -S flag-expired-memberships.py -q --log-file=DEBUG:$LOGDIR/flag-expired-memberships.log
+./flag-expired-memberships.py -q --log-file=DEBUG:$LOGDIR/flag-expired-memberships.log
 
 echo $(date): Allocating revision karma >> $LOGFILE
-python -S allocate-revision-karma.py -q --log-file=DEBUG:$LOGDIR/allocate-revision-karma.log
+./allocate-revision-karma.py -q --log-file=DEBUG:$LOGDIR/allocate-revision-karma.log
 
 echo $(date): Recalculating karma >> $LOGFILE
-python -S foaf-update-karma-cache.py -q --log-file=INFO:$LOGDIR/foaf-update-karma-cache.log
+./foaf-update-karma-cache.py -q --log-file=INFO:$LOGDIR/foaf-update-karma-cache.log
 
 echo $(date): Updating cached statistics >> $LOGFILE
-python -S update-stats.py -q --log-file=DEBUG:$LOGDIR/update-stats.log
+./update-stats.py -q --log-file=DEBUG:$LOGDIR/update-stats.log
 
 echo $(date): Expiring questions >> $LOGFILE
-python -S expire-questions.py -q --log-file=DEBUG:$LOGDIR/expire-questions.log
+./expire-questions.py -q --log-file=DEBUG:$LOGDIR/expire-questions.log
 
 echo $(date): Updating bugtask target name caches >> $LOGFILE
-python -S update-bugtask-targetnamecaches.py -q --log-file=DEBUG:$LOGDIR/update-bugtask-targetnamecaches.log
+./update-bugtask-targetnamecaches.py -q --log-file=DEBUG:$LOGDIR/update-bugtask-targetnamecaches.log
 
 echo $(date): Updating personal standings >> $LOGFILE
-python -S update-standing.py -q --log-file=DEBUG:$LOGDIR/update-standing.log
+./update-standing.py -q --log-file=DEBUG:$LOGDIR/update-standing.log
 
 echo $(date): Updating CVE database >> $LOGFILE
-python -S update-cve.py -q --log-file=DEBUG:$LOGDIR/update-cve.log
+./update-cve.py -q --log-file=DEBUG:$LOGDIR/update-cve.log
 
 echo $(date): Removing lock >> $LOGFILE
 rm -f $LOCK