Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

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

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 70a3ae766ffe8e660644334ca0f645dc29ffdfd6..e360a7ed053857c9d532b163e2a8c03f97fb3131 100755 (executable)
--- 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,15 +70,25 @@ function do_buildd () {
             fi
         done
         make_buildd_dir
-
-        . $configdir/cron.buildd
+        wbtrigger
     fi
 }
 
+function do_dists () {
+    cd $configdir
+    dak generate-filelist
+    GZIP='--rsyncable' ; export GZIP
+    dak generate-packages-sources
+}
+
 ########################################################################
 # 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"
@@ -87,9 +97,13 @@ function do_buildd () {
 lockfile -r3 $LOCKFILE || exit 0
 trap cleanup 0
 
+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