Merge mainline

[dak.git] / config / debian / cron.unchecked

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index b14b442df347661f0e9550895cf8ab4f169dc648..0e595736659968d462a9ab1f7686a90cf3c58616 100644 (file)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -1,12 +1,16 @@
 #! /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"
 
+if [ -e $NOTICE ]; then exit 0; fi
+
 cleanup() {
   rm -f "$LOCKFILE"
   if [ ! -z "$LOCKDAILY" ]; then
@@ -25,14 +29,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 +47,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
-