X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=c7d7dfdd2a402150bee9ffc1e470092987bf21c1;hb=a230888892aa3638bd2f51446a788659c182c2eb;hp=70a3ae766ffe8e660644334ca0f645dc29ffdfd6;hpb=37818276a5aba97d97763420a7655d2350dad747;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 70a3ae76..c7d7dfdd 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -26,13 +26,14 @@ 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=""
 LOCKFILE="$lockdir/unchecked.lock"
 LOCK_NEW="$lockdir/processnew.lock"
 NOTICE="$lockdir/daily.lock"
+LOCK_BUILDD="$lockdir/buildd.lock"
 
 # our name
 PROGRAM="unchecked"
@@ -59,7 +60,6 @@ cleanup() {
 function do_buildd () {
     if lockfile -r3 $NOTICE; then
         LOCKDAILY="YES"
-        psql projectb -A -t -q -c "SELECT build_queue.path || '/' || build_queue_files.filename FROM build_queue_files LEFT JOIN build_queue ON (build_queue.id = build_queue_files.build_queue_id) WHERE queue_name = 'accepted' AND filename ~ 'd(sc|eb)$';" > $dbdir/dists/unstable_accepted.list
         cd $overridedir
         dak make-overrides &>/dev/null
         rm -f override.sid.all3 override.sid.all3.src
@@ -70,26 +70,40 @@ function do_buildd () {
             fi
         done
         make_buildd_dir
-
-        . $configdir/cron.buildd
+        wbtrigger
     fi
 }
 
+function do_dists () {
+    cd $configdir
+    dak generate-filelist
+    dak generate-packages-sources >/dev/null
+}
+
 ########################################################################
 # the actual unchecked functions follow                                #
 ########################################################################
 
+# And use one locale, no matter what the caller has set
+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
 do_unchecked
 
 if [ ! -z "$changes" ]; then
     sync_debbugs
     do_buildd
+    do_dists
 fi