X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cron.buildd;h=5c59408a5d65870e02ced32c4e634b2cb1eb936e;hb=5ac1ebcc6c8514198de83318de2decbc1deeec9e;hp=b248e8f55e085b723dc968de243826756d550c30;hpb=07d2cc08925280afb5b79e1fa15bd0eef9a21ad7;p=dak.git diff --git a/cron.buildd b/cron.buildd index b248e8f5..5c59408a 100644 --- a/cron.buildd +++ b/cron.buildd @@ -11,7 +11,7 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress" if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then - if lockfile -! -r3 $LOCKFILE; then + if lockfile -r3 $LOCKFILE; then cleanup() { rm -f "$LOCKFILE" } @@ -19,7 +19,12 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then cd $overridedir denise &>/dev/null rm -f override.sid.all3 - for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done + for i in main contrib non-free main.debian-installer; do + cat override.sid.$i >> override.sid.all3 + if [ "$i" != "main.debian-installer" ]; then + cat override.sid.$i.src >> override.sid.all3.src + fi + done cd $masterdir apt-ftparchive -qq generate apt.conf.buildd cd /org/incoming.debian.org/buildd