Merge branch 'master' into franck

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

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 371671287d21642bd8aefb5703464b4a5402be41..c89c24c184aee357520d317f0609210452a08978 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"
@@ -69,8 +70,7 @@ function do_buildd () {
             fi
         done
         make_buildd_dir
-
-        . $configdir/cron.buildd
+        wbtrigger
     fi
 }
 
@@ -78,6 +78,10 @@ function do_buildd () {
 # 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"
@@ -86,6 +90,7 @@ function do_buildd () {
 lockfile -r3 $LOCKFILE || exit 0
 trap cleanup 0
 
+do_newstage
 do_unchecked
 
 if [ ! -z "$changes" ]; then