X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fcron.unchecked;h=a98ff0869604cd84349a1b967bca2de45e865c90;hb=f9d94e9465179b9a7f83559c846d25fcd4df131f;hp=b14b442df347661f0e9550895cf8ab4f169dc648;hpb=59fd5aa2a8be3b76dbc968429c457f096adfa472;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index b14b442d..a98ff086 100644
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -1,9 +1,11 @@
 #! /bin/sh
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+set -u
+export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+LOCKDAILY=""
 LOCKFILE="$lockdir/unchecked.lock"
 NOTICE="$lockdir/daily.lock"
 
@@ -25,14 +27,17 @@ if lockfile -r3 $LOCKFILE; then
 
 	if [ ! -z "$changes" ]; then
 		echo "$timestamp": "$changes"  >> $report
-		jennifer -a $changes >> $report
+		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
 			cd $overridedir
-			denise &>/dev/null
+			dak make-overrides &>/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
@@ -40,12 +45,11 @@ 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
 	fi
 fi
-