X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=5e819adfadd0f2e6b6982452e19e4be64c0c2589;hb=5390eff0ba7a732269f040b0a4c4a3b9a0db2733;hp=a9e59f2f373a7b7c006d08f49c17c011b1f55c40;hpb=7a10b5ede63f4f0138de4829cfa23994c8219956;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index a9e59f2f..5e819adf 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
@@ -26,7 +27,7 @@ set -u
 set -E
 
 # import the general variable set.
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 LOCKDAILY=""
@@ -70,10 +71,16 @@ function do_buildd () {
             fi
         done
         make_buildd_dir
-        wbtrigger "often"
+        wbtrigger
     fi
 }
 
+function do_dists () {
+    #cd $configdir
+    #dak generate-filelist -s unstable,experimental -i
+    dak generate-packages-sources2 -s unstable experimental >/dev/null
+}
+
 ########################################################################
 # the actual unchecked functions follow                                #
 ########################################################################
@@ -82,18 +89,29 @@ function do_buildd () {
 export LANG=C
 export LC_ALL=C
 
-#lockfile -r3 "$LOCK_NEW"
-# acceptnew
-#rm -f "$LOCK_NEW"
-
 # only run one cron.unchecked
-lockfile -r3 $LOCKFILE || exit 0
+if ! lockfile -r8 $LOCKFILE; then
+    echo "aborting cron.unchecked because $LOCKFILE has already been locked"
+    exit 0
+fi
 trap cleanup 0
 
-do_newstage
+
+pg_timestamp preunchecked >/dev/null
+
+# Process policy queues
+punew stable-new
+opunew oldstable-new
+
+# Finally deal with unchecked
 do_unchecked
 
 if [ ! -z "$changes" ]; then
     sync_debbugs
     do_buildd
+    #do_dists
 fi
+
+dak contents -l 10000 scan-binary
+dak contents -l 1000 scan-source
+pg_timestamp postunchecked >/dev/null