Merge remote branch 'mhy/master' into merge

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

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 6c142068533f96915997168c839826ff571bab91..10bd930c81add3e7aab0ea43f0b8db3467398cdc 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -76,9 +76,8 @@ function do_buildd () {
 
 function do_dists () {
     cd $configdir
-    dak generate-filelist -i
-    GZIP='--rsyncable' ; export GZIP
-    dak generate-packages-sources
+    dak generate-filelist
+    dak generate-packages-sources -s unstable experimental >/dev/null
 }
 
 ########################################################################
@@ -89,21 +88,23 @@ 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
 do_newstage
 do_unchecked
 
 if [ ! -z "$changes" ]; then
     sync_debbugs
     do_buildd
-    echo "Starting g-p-s: $(date +%H:%M:%S)"
     do_dists
-    echo "Done with g-p-s: $(date +%H:%M:%S)"
 fi
+
+dak contents -l 10000 binary-scan
+pg_timestamp postunchecked