X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=1ecbca743de92036ab5502f79d3f2600711af697;hb=f91bf88c622b3020bb4fe9abc27b350e586e7c45;hp=dfd9e916ac33ee134a3af160cc60a0b22b25261a;hpb=9e8a49aac094ee37db8abf38e46a42d7135437de;p=dak.git diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index dfd9e916..1ecbca74 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -354,12 +354,12 @@ function compress() { cd $base/backup/ find -maxdepth 1 -mindepth 1 -type f -name 'dump_pre_*' -mtime +2 -print0 | xargs -0 --no-run-if-empty rm - find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mmin 720 | + find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mmin +720 | while read dumpname; do echo "Compressing $dumpname" bzip2 -9v "$dumpname" done - find -maxdepth 1 -mindepth 1 -type f -name "dumpall_*" \! -name '*.bz2' \! -name '*.gz' -mmin 720 | + find -maxdepth 1 -mindepth 1 -type f -name "dumpall_*" \! -name '*.bz2' \! -name '*.gz' -mmin +720 | while read dumpname; do echo "Compressing $dumpname" bzip2 -9v "$dumpname" @@ -403,7 +403,9 @@ function testingsourcelist() { # do a last run of process-unchecked before dinstall is on. function process_unchecked() { + log "Processing the unchecked queue" acceptnew + UNCHECKED_WITHOUT_LOCK="-p" do_unchecked sync_debbugs } @@ -518,9 +520,12 @@ NOTICE="$ftpdir/Archive_Maintenance_In_Progress" # lock cron.unchecked (it immediately exits when this exists) LOCK_DAILY="$lockdir/daily.lock" -# Lock process-new and cron.unchecked from doing work +# Lock cron.unchecked from doing work LOCK_ACCEPTED="$lockdir/unchecked.lock" +# Lock process-new from doing work +LOCK_NEW="$lockdir/processnew.lock" + # This file is simply used to indicate to britney whether or not # the Packages file updates completed sucessfully. It's not a lock # from our point of view @@ -601,6 +606,7 @@ GO=( stage $GO lockfile "$LOCK_ACCEPTED" +lockfile "$LOCK_NEW" GO=( FUNC="process_unchecked" @@ -636,6 +642,7 @@ GO=( stage $GO rm -f "$LOCK_ACCEPTED" +rm -f "$LOCK_NEW" GO=( FUNC="msfl"