From: James Troup Date: Mon, 12 Jun 2006 00:41:46 +0000 (-0700) Subject: Fix invocation of scripts in cron.daily. X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=inline;h=ceba4993a87c1b416a01c814e37c3277775961bb;hp=-c;p=dak.git Fix invocation of scripts in cron.daily. --- ceba4993a87c1b416a01c814e37c3277775961bb diff --git a/ChangeLog b/ChangeLog index 08641bf3..47e22b13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-11 James Troup + * config/debian/vars (scriptsdir): new variable. + * config/debian/cron.daily: use it. + * scripts/debian/mkmaintainers: put Maintainers_Versions-non-US in $base/misc/ instead of versioned $masterdir. Correct 'dak make-maintainers' invocation to look in $configdir for diff --git a/config/debian/cron.daily b/config/debian/cron.daily index 5d85823b..27c674cb 100755 --- a/config/debian/cron.daily +++ b/config/debian/cron.daily @@ -39,9 +39,10 @@ pg_dump projectb > /org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S) ################################################################################ TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) -update-bugdoctxt -update-mirrorlists -update-mailingliststxt +cd $configdir +$scriptsdir/update-bugdoctxt +$scriptsdir/update-mirrorlists +$scriptsdir/update-mailingliststxt ################################################################################ @@ -110,11 +111,12 @@ apt-ftparchive generate apt.conf.buildd TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) -mkmaintainers -copyoverrides -mklslar -mkfilesindices -mkchecksums +cd $scriptsdir +./mkmaintainers +./copyoverrides +./mklslar +./mkfilesindices +./mkchecksums # # Fetch bugs information before unchecked processing is allowed again. /org/ftp.debian.org/testing/britney bugs @@ -166,7 +168,8 @@ echo Daily cron scripts successful. TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) # Stats pr0n -update-ftpstats $base/log/* > $base/misc/ftpstats.data +cd $configdir +$scriptsdir/update-ftpstats $base/log/* > $base/misc/ftpstats.data R --slave --vanilla < $base/misc/ftpstats.R TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X) diff --git a/config/debian/vars b/config/debian/vars index 974ca12a..59fd6b31 100644 --- a/config/debian/vars +++ b/config/debian/vars @@ -9,6 +9,7 @@ archs="alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sp scriptdir=$base/scripts masterdir=$base/dak/ configdir=$base/dak/config/debian/ +scriptsdir=$base/dak/scripts/debian/ dbdir=$base/database/ lockdir=$base/lock/ overridedir=$scriptdir/override