Run policy from unchecked as well as dinstall

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

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 0e956cac9e98feb225296cca8cd9898aecdceec4..a534ba06cf2cd159045f1c009c818fe8581fad47 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -75,10 +75,9 @@ function do_buildd () {
 }
 
 function do_dists () {
-    cd $configdir
-    dak generate-filelist
-    GZIP='--rsyncable' ; export GZIP
-    dak generate-packages-sources >/dev/null
+    #cd $configdir
+    #dak generate-filelist -s unstable,experimental -i
+    dak generate-packages-sources2 -s unstable experimental >/dev/null
 }
 
 ########################################################################
@@ -89,19 +88,32 @@ function do_dists () {
 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
 
+
+pg_timestamp preunchecked >/dev/null
+
+# Process policy queues
+punew proposedupdates
+opunew oldproposedupdates
+
+# Now process the NEW staging area
 do_newstage
+
+# Finally deal with unchecked
 do_unchecked
 
 if [ ! -z "$changes" ]; then
     sync_debbugs
     do_buildd
-    do_dists
+    #do_dists
 fi
+
+dak contents -l 10000 scan-binary
+dak contents -l 1000 scan-source
+pg_timestamp postunchecked >/dev/null