From: Ryan Murray <rmurray@debian.org>
Date: Thu, 1 Aug 2002 21:01:37 +0000 (+0000)
Subject: use two if's instead
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=07d2cc08925280afb5b79e1fa15bd0eef9a21ad7;p=dak.git

use two if's instead
---

diff --git a/cron.buildd b/cron.buildd
index 0907b15c..b248e8f5 100644
--- a/cron.buildd
+++ b/cron.buildd
@@ -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