X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=371671287d21642bd8aefb5703464b4a5402be41;hb=f3cbed6812df92b24987c519ecfdd00787d7e2a4;hp=e18f8635d62a50bbfe966d765867142b311c7ab5;hpb=bd2efade5bfe477a21a68f25f3a305f562ae539d;p=dak.git diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked index e18f8635..37167128 100755 --- a/config/debian/cron.unchecked +++ b/config/debian/cron.unchecked @@ -20,6 +20,10 @@ set -e # make sure to only use defined variables set -u +# ERR traps should be inherited from functions too. (And command +# substitutions and subshells and whatnot, but for us the functions is +# the important part here) +set -E # import the general variable set. export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars @@ -30,6 +34,9 @@ LOCKFILE="$lockdir/unchecked.lock" LOCK_NEW="$lockdir/processnew.lock" NOTICE="$lockdir/daily.lock" +# our name +PROGRAM="unchecked" + if [ -e $NOTICE ]; then exit 0; fi @@ -52,7 +59,6 @@ cleanup() { function do_buildd () { if lockfile -r3 $NOTICE; then LOCKDAILY="YES" - psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE queue = 0 AND suite = 5 AND in_queue = true 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 @@ -72,9 +78,9 @@ function do_buildd () { # the actual unchecked functions follow # ######################################################################## -lockfile "$LOCK_NEW" -acceptnew -rm -f "$LOCK_NEW" +#lockfile -r3 "$LOCK_NEW" +# acceptnew +#rm -f "$LOCK_NEW" # only run one cron.unchecked lockfile -r3 $LOCKFILE || exit 0