X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fcron.unchecked;h=6d3226d894ac74d2052bf4ea7bf9b67add985013;hb=b9b8223ed20df7f07052f3182585ac7753e50c02;hp=447904560f81f908ef1b1e8937db320adba78b73;hpb=e5a639958c38b2fbfb1a6063cc6ce5f102f3017f;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 44790456..6d3226d8 100755
--- 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"
 
@@ -60,24 +60,15 @@ cleanup() {
 function do_buildd () {
     if lockfile -r3 $NOTICE; then
         LOCKDAILY="YES"
-        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
         wbtrigger
     fi
 }
 
 function do_dists () {
-    cd $configdir
-    dak generate-filelist
-    dak generate-packages-sources >/dev/null
+    #cd $configdir
+    #dak generate-filelist -s unstable,experimental -i
+    dak generate-packages-sources2 -s unstable experimental >/dev/null
 }
 
 ########################################################################
@@ -88,10 +79,6 @@ function do_dists () {
 export LANG=C
 export LC_ALL=C
 
-#lockfile -r3 "$LOCK_NEW"
-# acceptnew
-#rm -f "$LOCK_NEW"
-
 # only run one cron.unchecked
 if ! lockfile -r8 $LOCKFILE; then
     echo "aborting cron.unchecked because $LOCKFILE has already been locked"
@@ -99,13 +86,24 @@ if ! lockfile -r8 $LOCKFILE; then
 fi
 trap cleanup 0
 
-do_newstage
+
+pg_timestamp preunchecked >/dev/null
+
+# Process policy queues
+punew stable-new
+opunew oldstable-new
+backports_policy
+dak clean-suites -a backports-policy,policy
+
+# Finally deal with unchecked
 do_unchecked
 
 if [ ! -z "$changes" ]; then
     sync_debbugs
     do_buildd
-    do_dists
+    #do_dists
 fi
 
-dak contents -l 5000 scan
+dak contents -l 10000 scan-binary
+dak contents -l 1000 scan-source
+pg_timestamp postunchecked >/dev/null