X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=507fc5843ac8089803028c7f964daed859620e82;hb=9c526f277fc6f57e8255aaffdc25894999488882;hp=cf9cd6e18e7e6e89ef1eb59c16822d06e01588e8;hpb=3d724aecf9c7b5aa869d3714bf1648a82f722cbc;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index cf9cd6e1..507fc584 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -20,6 +20,10 @@
 set -e
 # make sure to only use defined variables
 set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 
 # import the general variable set.
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
@@ -27,8 +31,12 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 
 LOCKDAILY=""
 LOCKFILE="$lockdir/unchecked.lock"
+LOCK_NEW="$lockdir/processnew.lock"
 NOTICE="$lockdir/daily.lock"
 
+# our name
+PROGRAM="unchecked"
+
 if [ -e $NOTICE ]; then
     exit 0;
 fi
@@ -51,7 +59,7 @@ cleanup() {
 function do_buildd () {
     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
+        psql projectb -A -t -q -c "SELECT build_queue.path || '/' || build_queue_files.filename FROM build_queue_files LEFT JOIN build_queue ON (build_queue.id = build_queue_files.build_queue_id) WHERE queue_name = 'buildd' 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
@@ -71,7 +79,9 @@ function do_buildd () {
 # the actual unchecked functions follow                                #
 ########################################################################
 
-acceptnew
+#lockfile -r3 "$LOCK_NEW"
+# acceptnew
+#rm -f "$LOCK_NEW"
 
 # only run one cron.unchecked
 lockfile -r3 $LOCKFILE || exit 0