Merge lp:~adeuring/launchpad/bug-793630 into lp:launchpad

[Abel Deuring]

[r=allenap][bug=793630][no-qa] replace hard coded path to the script directory in cron.publish-ppa with a relative path.

This branch fixes bug 793630: better cronscript setup: remove hard-coded paths from cronscripts/publishing/cron.base-ppa.

The cronscripts/publishing/cron.publish-ppa used the environment variable LPCURRENT to build the path to the scripts it called. This caused a failure for PPA builds some weeks ago because the location of the tree on the server was changed.

Julian suggested a simple fix: To use a relative path instead of an absolute path. This works, as long as the locations of the cronscript and of the scripts it calls within the source tree are not changed.

Script activity is already recorded by the scripts called by cron.publish-ppa, so there is no nedd to do additional recording in the cronscript itself.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'cronscripts/publishing/cron.base-ppa'
--- cronscripts/publishing/cron.base-ppa	2011-06-01 00:01:51 +0000
+++ cronscripts/publishing/cron.base-ppa	2011-06-16 14:39:54 +0000
@@ -7,7 +7,6 @@
 
 # DO NOT set LPCONFIG here, it should come from the crontab or the shell.
 # Define common variables.
-LPCURRENT=/srv/launchpad.net/production/launchpad
 PPAROOT=/srv/launchpad.net/ppa-archive
 P3AROOT=/srv/launchpad.net/private-ppa-archive
 LOCKFILE=$PPAROOT/.lock

=== modified file 'cronscripts/publishing/cron.publish-ppa'
--- cronscripts/publishing/cron.publish-ppa	2009-06-24 20:52:01 +0000
+++ cronscripts/publishing/cron.publish-ppa	2011-06-16 14:39:54 +0000
@@ -8,6 +8,8 @@
 # Variables, lockfile and exit handler for PPA scripts.
 source `dirname $0`/cron.base-ppa
 
+LPCURRENT=`dirname $0`/../..
+
 # Accept PPA binary uploads
 $LPCURRENT/scripts/process-accepted.py -v --ppa ubuntu