processnew.lock is no longer required

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

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index d3e07e158a7b3453a14874d0266200d77190aed0..7db5c284574697dcfcd3883fce5a8310cb31a87d 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -18,6 +18,7 @@
 
 # exit on errors
 set -e
+set -o pipefail
 # make sure to only use defined variables
 set -u
 # ERR traps should be inherited from functions too. (And command
@@ -31,7 +32,6 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 
 LOCKDAILY=""
 LOCKFILE="$lockdir/unchecked.lock"
-LOCK_NEW="$lockdir/processnew.lock"
 NOTICE="$lockdir/daily.lock"
 LOCK_BUILDD="$lockdir/buildd.lock"
 
@@ -62,11 +62,13 @@ function do_buildd () {
         LOCKDAILY="YES"
         cd $overridedir
         dak make-overrides &>/dev/null
-        rm -f override.sid.all3 override.sid.all3.src
+        rm -f override.sid.all3 override.sid.all3.src override.squeeze-backports.all3 override.squeeze-backports.all3.src
         for i in main contrib non-free main.debian-installer; do
             cat override.sid.$i >> override.sid.all3
+            cat override.squeeze-backports.$i >> override.squeeze-backports.all3
             if [ "$i" != "main.debian-installer" ]; then
                 cat override.sid.$i.src >> override.sid.all3.src
+                cat override.squeeze-backports.$i.src >> override.squeeze-backports.all3.src
             fi
         done
         make_buildd_dir
@@ -97,7 +99,12 @@ trap cleanup 0
 
 
 pg_timestamp preunchecked >/dev/null
-do_newstage
+
+# Process policy queues
+punew stable-new
+opunew oldstable-new
+
+# Finally deal with unchecked
 do_unchecked
 
 if [ ! -z "$changes" ]; then