X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=34571185fa69f0fb2d85ef6b303872c9166202b8;hb=2a0aae5ffea0cca4b9581c2d3afcc2752bbd04c9;hp=8dc3b1f037a10766ccf2ce97a1d3e059c7a1a1ea;hpb=56c670d4b1dd0d73a38f9e6d47d48356b8cc3407;p=dak.git diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked index 8dc3b1f0..34571185 100755 --- a/config/debian/cron.unchecked +++ b/config/debian/cron.unchecked @@ -32,7 +32,6 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars LOCKDAILY="" LOCKFILE="$lockdir/unchecked.lock" -LOCK_NEW="$lockdir/processnew.lock" NOTICE="$lockdir/daily.lock" LOCK_BUILDD="$lockdir/buildd.lock" @@ -63,11 +62,13 @@ function do_buildd () { LOCKDAILY="YES" cd $overridedir dak make-overrides &>/dev/null - rm -f override.sid.all3 override.sid.all3.src + rm -f override.sid.all3 override.sid.all3.src override.squeeze-backports.all3 override.squeeze-backports.all3.src for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3 + cat override.squeeze-backports.$i >> override.squeeze-backports.all3 if [ "$i" != "main.debian-installer" ]; then cat override.sid.$i.src >> override.sid.all3.src + cat override.squeeze-backports.$i.src >> override.squeeze-backports.all3.src fi done make_buildd_dir @@ -100,11 +101,10 @@ trap cleanup 0 pg_timestamp preunchecked >/dev/null # Process policy queues -punew proposedupdates -opunew oldproposedupdates - -# Now process the NEW staging area -do_newstage +punew stable-new +opunew oldstable-new +backports_policy +dak clean-suites -a backports-policy,policy # Finally deal with unchecked do_unchecked