Launchpad itself

Merge ~cjwatson/launchpad:fix-nightly into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-nightly
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: d7ec3de5eb3534356ef96e60e93d96e52ea143b7
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-nightly
Merge into: launchpad:master
Diff against target: 41 lines (+8/-8)
1 file modified
cronscripts/nightly.sh (+8/-8)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+407692@code.launchpad.net

Commit message

Fix nightly.sh for Python 3

Description of the change

We can no longer just run scripts with "python -S" and expect them to re-exec themselves with the correct Python version.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cronscripts/nightly.sh b/cronscripts/nightly.sh
2index c22900c..9c4a674 100755
3--- a/cronscripts/nightly.sh
4+++ b/cronscripts/nightly.sh
5@@ -24,28 +24,28 @@ cd `dirname $0`
6 echo $(date): Grabbed lock >> $LOGFILE
7
8 echo $(date): Expiring memberships >> $LOGFILE
9-python -S flag-expired-memberships.py -q --log-file=DEBUG:$LOGDIR/flag-expired-memberships.log
10+./flag-expired-memberships.py -q --log-file=DEBUG:$LOGDIR/flag-expired-memberships.log
11
12 echo $(date): Allocating revision karma >> $LOGFILE
13-python -S allocate-revision-karma.py -q --log-file=DEBUG:$LOGDIR/allocate-revision-karma.log
14+./allocate-revision-karma.py -q --log-file=DEBUG:$LOGDIR/allocate-revision-karma.log
15
16 echo $(date): Recalculating karma >> $LOGFILE
17-python -S foaf-update-karma-cache.py -q --log-file=INFO:$LOGDIR/foaf-update-karma-cache.log
18+./foaf-update-karma-cache.py -q --log-file=INFO:$LOGDIR/foaf-update-karma-cache.log
19
20 echo $(date): Updating cached statistics >> $LOGFILE
21-python -S update-stats.py -q --log-file=DEBUG:$LOGDIR/update-stats.log
22+./update-stats.py -q --log-file=DEBUG:$LOGDIR/update-stats.log
23
24 echo $(date): Expiring questions >> $LOGFILE
25-python -S expire-questions.py -q --log-file=DEBUG:$LOGDIR/expire-questions.log
26+./expire-questions.py -q --log-file=DEBUG:$LOGDIR/expire-questions.log
27
28 echo $(date): Updating bugtask target name caches >> $LOGFILE
29-python -S update-bugtask-targetnamecaches.py -q --log-file=DEBUG:$LOGDIR/update-bugtask-targetnamecaches.log
30+./update-bugtask-targetnamecaches.py -q --log-file=DEBUG:$LOGDIR/update-bugtask-targetnamecaches.log
31
32 echo $(date): Updating personal standings >> $LOGFILE
33-python -S update-standing.py -q --log-file=DEBUG:$LOGDIR/update-standing.log
34+./update-standing.py -q --log-file=DEBUG:$LOGDIR/update-standing.log
35
36 echo $(date): Updating CVE database >> $LOGFILE
37-python -S update-cve.py -q --log-file=DEBUG:$LOGDIR/update-cve.log
38+./update-cve.py -q --log-file=DEBUG:$LOGDIR/update-cve.log
39
40 echo $(date): Removing lock >> $LOGFILE
41 rm -f $LOCK

Subscribers

People subscribed via source and target branches

to status/vote changes: