From: Joerg Jaspert Date: Tue, 22 Dec 2009 22:43:12 +0000 (+0100) Subject: dinstall X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=d0d94b9b1e5b21a6769991ffcb8a4eb4983efc71;p=dak.git dinstall move the i18n foo up before locks lock before we do the (o-)p-u-new stuff do a newstage run, so the running dinstall actually includes the just accepted (o-)p-u-new files, not leaving them for one later. Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index cf25522c..fd32a9ee 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -195,6 +195,17 @@ GO=( ) stage $GO & +GO=( + FUNC="i18n1" + TIME="i18n 1" + ARGS="" + ERR="false" +) +stage $GO & + +lockfile "$LOCK_ACCEPTED" +lockfile "$LOCK_NEW" + GO=( FUNC="punew" TIME="p-u-new" @@ -212,25 +223,12 @@ GO=( stage $GO GO=( - FUNC="i18n1" - TIME="i18n 1" - ARGS="" - ERR="false" -) -stage $GO & - -lockfile "$LOCK_ACCEPTED" -lockfile "$LOCK_NEW" - -GO=( - FUNC="process_unchecked" - TIME="unchecked" + FUNC="newstage" + TIME="newstage" ARGS="" ERR="" ) -# disabled until p-u is faster than now. it runs often enough, so wont hurt to save -# the time here. -#stage $GO +stage $GO GO=( FUNC="cruft" diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 91825e7d..abc5a5b5 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -542,6 +542,13 @@ function process_unchecked() { sync_debbugs } +# do a run of newstage only before dinstall is on. +function process_newstage() { + log "Processing the newstage queue" + UNCHECKED_WITHOUT_LOCK="-p" + do_newstage +} + # Function to update a "statefile" telling people what we are doing # (more or less). #