]> git.decadent.org.uk Git - dak.git/commitdiff
use two if's instead
authorRyan Murray <rmurray@debian.org>
Thu, 1 Aug 2002 21:01:37 +0000 (21:01 +0000)
committerRyan Murray <rmurray@debian.org>
Thu, 1 Aug 2002 21:01:37 +0000 (21:01 +0000)
cron.buildd

index 0907b15c991d3f32302493871dfb5dd0e79fb9d3..b248e8f55e085b723dc968de243826756d550c30 100644 (file)
@@ -10,7 +10,8 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 
 LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
 
-if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" -a lockfile -! -r3 $LOCKFILE ]; then
+if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
+       if lockfile -! -r3 $LOCKFILE; then
        cleanup() {
                rm -f "$LOCKFILE"
        }
@@ -26,4 +27,5 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" -a lockfile -! -r3 $LOCKFILE
                quinn-diff -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -A $a 2>/dev/null | grep -v ^non-free | wanna-build -b $a/build-db --merge-partial-quinn 2> /dev/null
                wanna-build -A $a -b $a/build-db --merge-packages Packages 2>/dev/null
        done
+       fi
 fi