X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.buildd;h=96607e4850c48a216b03b4acc7cb4959e49a7c0c;hb=4a267a9e31e7ae7c08189e5d23944d569da4116c;hp=7dbac763678c331a57fd55c312840b433465b8ce;hpb=ea17738cea735d71766bfc2bd082f59b3adf2dbb;p=dak.git

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 7dbac763..96607e48 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -12,58 +12,65 @@ set -e
 export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
-if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
-	cd $masterdir
-	for d in $DISTS; do
-		eval SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
-		eval PACKAGES_$d=`stat -c "%Y" $base/buildd/$d/Packages.gz`
-	done
-	apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
-	dists=
-	for d in $DISTS; do
-		eval NEW_SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
-		eval NEW_PACKAGES_$d=`stat -c "%Y" $base/buildd/$d/Packages.gz`
-		old=SOURCES_$d
-                new=NEW_$old
-                if [ ${!new} -gt ${!old} ]; then
-			if [ -z "$dists" ]; then
-				dists="$d"
-			else
-				dists="$dists $d"
-			fi
-			continue
+if [ -e $ftpdir/Archive_Maintenance_In_Progress ]; then
+	exit 0
+fi
+
+cd $masterdir
+for d in $DISTS; do
+	eval SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
+	eval PACKAGES_$d=`stat -c "%Y" $base/buildd/$d/Packages.gz`
+done
+
+apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
+dists=
+for d in $DISTS; do
+	eval NEW_SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
+	eval NEW_PACKAGES_$d=`stat -c "%Y" $base/buildd/$d/Packages.gz`
+	old=SOURCES_$d
+        new=NEW_$old
+        if [ ${!new} -gt ${!old} ]; then
+		if [ -z "$dists" ]; then
+			dists="$d"
+		else
+			dists="$dists $d"
 		fi
-		old=PACKAGES_$d
-		new=NEW_$old
-                if [ ${!new} -gt ${!old} ]; then
-			if [ -z "$dists" ]; then
-				dists="$d"
-			else
-				dists="$dists $d"
-			fi
-			continue
+		continue
+	fi
+	old=PACKAGES_$d
+	new=NEW_$old
+        if [ ${!new} -gt ${!old} ]; then
+		if [ -z "$dists" ]; then
+			dists="$d"
+		else
+			dists="$dists $d"
 		fi
+		continue
+	fi
+done
+
+if [ ! -z "$dists" ]; then
+	# setup ssh master process
+	ssh buildd@buildd -S $SSH_SOCKET -MN 2> /dev/null &
+	SSH_PID=$!
+	while [ ! -S $SSH_SOCKET ]; do
+		sleep 1
 	done
-	if [ ! -z "$dists" ]; then
-		# setup ssh master process
-		ssh buildd@buildd -S $SSH_SOCKET -MN 2> /dev/null &
-		SSH_PID=$!
-		while [ ! -S $SSH_SOCKET ]; do
-			sleep 1
-		done
-		trap 'kill -TERM $SSH_PID' 0
-		for d in $dists; do
-			archs=ARCHS_$d
-			ARCHS=${!archs}
-			cd /org/security.debian.org/buildd/$d
+	trap 'kill -TERM $SSH_PID' 0
+	for d in $dists; do
+		archs=ARCHS_$d
+		ARCHS=${!archs}
+		cd /org/security.debian.org/buildd/$d
+		if [ "$d" != "oldstable" ]; then
+			# disabled for oldstable-security by ajt 2008-01-01
 			for a in $ARCHS; do
 				quinn-diff -a /org/security.debian.org/buildd/Packages-arch-specific -A $a 2>/dev/null | ssh buildd@buildd -S $SSH_SOCKET wanna-build -d $d-security -b $a/build-db --merge-partial-quinn
+
 				ssh buildd@buildd -S $SSH_SOCKET wanna-build -d $d-security -A $a -b $a/build-db --merge-packages < Packages
 			done
-			if [ "$d" = "oldstable" ]; then
-				ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
-			fi
-		done
-	fi
+		else
+			ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
+		fi
+	done
 fi