X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=0e595736659968d462a9ab1f7686a90cf3c58616;hb=eb69358ebf5fa0dd8258f58035eb209edc5db4ca;hp=124f7f6eb42f90ee23eb19aa140d19b95d464d9e;hpb=17cec6a95a357324d0292155242310aed6757ebf;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 124f7f6e..0e595736 100644
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -1,12 +1,16 @@
 #! /bin/sh
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
+set -u
+export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+LOCKDAILY=""
 LOCKFILE="$lockdir/unchecked.lock"
 NOTICE="$lockdir/daily.lock"
 
+if [ -e $NOTICE ]; then exit 0; fi
+
 cleanup() {
   rm -f "$LOCKFILE"
   if [ ! -z "$LOCKDAILY" ]; then
@@ -28,6 +32,9 @@ if lockfile -r3 $LOCKFILE; then
 		dak process-unchecked -a $changes >> $report
 		echo "--" >> $report
 
+		# sync with debbugs
+		$scriptsdir/ssh-move --server --ssh-identity /srv/ftp.debian.org/s3kr1t/id_debbugs-vt --ssh-move-path /home/debbugs/ssh-move --from-directory $queuedir/bts_version_track --to-directory /org/bugs.debian.org/versions/queue/ftp-master debbugs@bugs.debian.org \*.debinfo \*.versions
+
 		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
@@ -40,9 +47,9 @@ if lockfile -r3 $LOCKFILE; then
 					cat override.sid.$i.src >> override.sid.all3.src
 				fi
 			done
-			cd $masterdir
-			apt-ftparchive -qq generate apt.conf.buildd
-			. $masterdir/cron.buildd
+			cd $configdir
+			apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
+			. $configdir/cron.buildd
 		fi
 	else
 		echo "$timestamp": Nothing to do >> $report