X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.unchecked;h=b14b442df347661f0e9550895cf8ab4f169dc648;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=5f46244b96634f6c1dbcb592d486be12db429b63;hpb=bd833f87ae7f6bfacb988f1431ed78683617d246;p=dak.git

diff --git a/cron.unchecked b/cron.unchecked
index 5f46244b..b14b442d 100644
--- a/cron.unchecked
+++ b/cron.unchecked
@@ -1,19 +1,51 @@
 #! /bin/sh
 
 set -e
-export SCRIPTVARS=/org/ftp-master.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 . $SCRIPTVARS
 
-cd $unchecked
+LOCKFILE="$lockdir/unchecked.lock"
+NOTICE="$lockdir/daily.lock"
 
-changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
-report=$queuedir/REPORT
-timestamp=$(date "+%Y-%m-%d %H:%M")
+cleanup() {
+  rm -f "$LOCKFILE"
+  if [ ! -z "$LOCKDAILY" ]; then
+	  rm -f "$NOTICE"
+  fi
+}
+
+# only run one cron.unchecked
+if lockfile -r3 $LOCKFILE; then
+	trap cleanup 0
+	cd $unchecked
+
+	changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
+	report=$queuedir/REPORT
+	timestamp=$(date "+%Y-%m-%d %H:%M")
+
+	if [ ! -z "$changes" ]; then
+		echo "$timestamp": "$changes"  >> $report
+		jennifer -a $changes >> $report
+		echo "--" >> $report
+
+		if lockfile -r3 $NOTICE; then
+			LOCKDAILY="YES"
+			psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE queue = 0 AND suite = 5 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
+			cd $overridedir
+			denise &>/dev/null
+			rm -f override.sid.all3 override.sid.all3.src
+			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
+			. $masterdir/cron.buildd
+		fi
+	else
+		echo "$timestamp": Nothing to do >> $report
+	fi
+fi
 
-if [ ! -z "$changes" ]; then
-  echo "$timestamp": "$changes"  >> $report
-  jennifer -a $changes >> $report
-  echo "--" >> $report
-else
-  echo "$timestamp": Nothing to do >> $report
-fi;