X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=0006f80e3a4c5ddaf0730e962e50ae996bdafbd2;hb=87bf163d12ec8328d87e1b2a2ca2239221a73bd6;hp=04b0615639553eb62549c98c48a7fa2575abca32;hpb=6f984c8f09377f51ea631e9bbfcd9ab02a39f993;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
old mode 100644
new mode 100755
index 04b06156..0006f80e
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -1,52 +1,88 @@
-#! /bin/sh
+#! /bin/bash
 
 set -e
 set -u
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+# common functions are "outsourced"
+. "${configdir}/common"
+
 LOCKDAILY=""
 LOCKFILE="$lockdir/unchecked.lock"
 NOTICE="$lockdir/daily.lock"
 
+if [ -e $NOTICE ]; then exit 0; fi
+
+STAMP=$(date "+%Y%m%d%H%M")
+
 cleanup() {
-  rm -f "$LOCKFILE"
-  if [ ! -z "$LOCKDAILY" ]; then
-	  rm -f "$NOTICE"
-  fi
+    rm -f "$LOCKFILE"
+    if [ ! -z "$LOCKDAILY" ]; then
+        rm -f "$NOTICE"
+    fi
 }
 
+# in case there is anything NEW processed, move it over into the accepted queue
+cd $newstage
+for file in $(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs); do
+    sed '1,/Files:/d' "${file}" | sed '/BEGIN PGP SIGNATURE/,$d' \
+        | while read notused1 notused2 notused3 notused4 NAME; do
+        if [ -z "${NAME}" ]; then
+            # Sometimes there is a newline after the Files:, ignore it
+            continue
+        fi
+        if [ -f "${NAME}" ]; then
+            mv --target-directory="${accepted}" "${NAME}"
+        else
+            log_error "Error, couldn't find file ${NAME} to move to ${accepted}"
+            exit 2
+        fi
+    done
+    mv --target-directory="${accepted}"  "${file}" "${file%%.changes}.dak"
+done
+
 # 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
-		dak process-unchecked -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
-			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
-				if [ "$i" != "main.debian-installer" ]; then
-					cat override.sid.$i.src >> override.sid.all3.src
-				fi
-			done
-			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
+    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
+        dak process-unchecked -a -d "$unchecked" >> $report
+        echo "--" >> $report
+
+         # sync with debbugs
+        rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true
+
+        NOW=$(date +%s)
+        TSTAMP=$(stat -c %Y $lockdir/synced_bts_version)
+        DIFF=$(( NOW - TSTAMP ))
+        if [ $DIFF -ge 259200 ]; then
+            echo "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)"
+        fi
+
+        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
+            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
+                if [ "$i" != "main.debian-installer" ]; then
+                    cat override.sid.$i.src >> override.sid.all3.src
+                fi
+            done
+            make_buildd_dir
+
+            . $configdir/cron.buildd
+        fi
+    else
+        echo "$timestamp": Nothing to do >> $report
+    fi
 fi