Merge lp:~wgrant/launchpad/argh-cowboys into lp:launchpad

Proposed by William Grant
Status: Merged
Merged at revision: 13144
Proposed branch: lp:~wgrant/launchpad/argh-cowboys
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
cronscripts/publishing/cron.base-ppa (+1/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/argh-cowboys
Reviewer Review Type Date Requested Status
William Grant Approve
Review via email: mp+63056@code.launchpad.net

Commit message

Fix cron.base-ppa to use germanium's nodowntime tree.

Description of the change

cron.publish-ppa is now run from germanium's ppa-scripts nodowntime tree, but still uses scripts from the downtime ppa tree. This branch lands a cowboy to fix this, after https://wiki.canonical.com/IncidentReports/2011-05-31-LP-PPA%20publishing%20broken.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cronscripts/publishing/cron.base-ppa'
2--- cronscripts/publishing/cron.base-ppa 2010-06-24 13:41:23 +0000
3+++ cronscripts/publishing/cron.base-ppa 2011-06-01 00:26:03 +0000
4@@ -7,7 +7,7 @@
5
6 # DO NOT set LPCONFIG here, it should come from the crontab or the shell.
7 # Define common variables.
8-LPCURRENT=/srv/launchpad.net/codelines/current
9+LPCURRENT=/srv/launchpad.net/production/launchpad
10 PPAROOT=/srv/launchpad.net/ppa-archive
11 P3AROOT=/srv/launchpad.net/private-ppa-archive
12 LOCKFILE=$PPAROOT/.lock