use "set -o pipefail" for shell scripts

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

diff --git a/config/backports/cron.unchecked b/config/backports/cron.unchecked
index d5ada070900e5670dbd6ea355a59ba922cc0c77c..13be8d592a3ac0ce18f57e90c1762a98181a8fb4 100755 (executable)
--- a/config/backports/cron.unchecked
+++ b/config/backports/cron.unchecked
@@ -17,6 +17,7 @@
 
 # exit on errors
 set -e
+set -o pipefail
 # make sure to only use defined variables
 set -u
 # ERR traps should be inherited from functions too. (And command
@@ -24,7 +25,7 @@ set -u
 # the important part here)
 set -E
 
-export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports/vars
 . $SCRIPTVARS
 
 
@@ -33,6 +34,8 @@ LOCKFILE="$lockdir/unchecked.lock"
 LOCK_NEW="$lockdir/processnew.lock"
 NOTICE="$lockdir/daily.lock"
 LOCK_BUILDD="$lockdir/buildd.lock"
+# The state file telling us we have something new to do
+DINSTALLPACKAGES="${lockdir}/dinstall.packages"
 
 # our name
 PROGRAM="unchecked"
@@ -63,9 +66,9 @@ function do_buildd () {
         dak make-overrides &>/dev/null
         rm -f override.sid.all3 override.sid.all3.src
         for i in main contrib non-free main.debian-installer; do
-            cat override.lenny-backports.$i >> override.sid.all3
+            cat override.squeeze-backports.$i >> override.sid.all3
             if [ "$i" != "main.debian-installer" ]; then
-                cat override.lenny-backports.$i.src >> override.sid.all3.src
+                cat override.squeeze-backports.$i.src >> override.sid.all3.src
             fi
         done
         make_buildd_dir
@@ -76,7 +79,6 @@ function do_buildd () {
 function do_dists () {
     cd $configdir
     dak generate-filelist
-    GZIP='--rsyncable' ; export GZIP
     dak generate-packages-sources
 }
 
@@ -96,8 +98,10 @@ do_newstage
 do_unchecked
 
 if [ ! -z "$changes" ]; then
+    touch ${DINSTALLPACKAGES}
     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)"