From: Michael Casadevall Date: Tue, 30 Dec 2008 21:13:05 +0000 (-0500) Subject: Merge branch 'master' into dm_upload_allowed X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=85e6c424f8c5d1a6f7778b683696322cc2256fc1;hp=ded1d77c90fea5054c4f07b9c55119e520e972d5;p=dak.git Merge branch 'master' into dm_upload_allowed Conflicts: ChangeLog --- diff --git a/ChangeLog b/ChangeLog index ec9bdc0f..946cf32a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,24 +1,11 @@ -2008-12-29 Michael Casadevall +2008-12-30 Joerg Jaspert - * dak/update_db.py - Modified to use the lockfile and uncommented sleep() call + * config/debian/cron.hourly: Generate the 822 format for accepted, + new, byhand and proposed-updates -2008-12-28 Michael Casadevall +2008-12-30 Michael Casadevall - * dak/process_unchecked.py - Modified DM to comply strictly with the DM GR - Upload right to a package is determined by the - newest version of that package in the archive - - * dak/process_unchecked.py - Added new REJECT for DM-Upload-Allowed not being set - and clarified NMU reject message. - - * dak/update_db.py - Added a update-database mechanism. New database updates - can be added by simply adding a simple upgrade script to dakdb - It probably has some bugs, but it can update git HEAD 12-08-2008 - to DB revision 1 without any issues. - - * dak/dakdb/1.py - Adds DM tables - - * dak/import_keyring - Fixed an argument typo on the help screen + * dak/queue_report.py - Added directories option to queue report 2008-12-28 Frank Lichtenheld @@ -26,28 +13,7 @@ 2008-12-26 Michael Casadevall - * dak/import_keyring.py - Debrainized the projectb schema w.r.t. to DMs - Now uses Debian-Maintainer column in uid table - - * dak/import_ldap_fingerprints.py - Ditto - - * dak/process_unchecked.py - Same - - * scripts/debian/byhand-dm - See Above - - * setup/init_pool.sql - More of the same - - * dak/process_unchecked.py - Implemented new dm_upload_allowed field in source - - * dak/process_unchecked.py - Fixed bug where dm-upload-allowed would not be respected - in cases where only experimental had the DM-Upload-Allowed: yes flag. - - * dak/process_accepted.py - Ditto, also causes new uploads to include uploaders - table to properly include all uploads - - * setup/init_pool.sql - Updated schema - - * dak/queue_report.py - Added Last Modified in asctime() for QA team + * dak/queue_report.py - Added Last Modified in asctime() for QA team 2008-12-23 Michael Casadevall diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly index 3ff3f7d5..e543434a 100755 --- a/config/debian/cron.hourly +++ b/config/debian/cron.hourly @@ -11,7 +11,8 @@ date -u > $ftpdir/project/trace/ftp-master.debian.org echo "Using dak v1" >> $ftpdir/project/trace/ftp-master.debian.org echo "Running on host: $(hostname -f)" >> $ftpdir/project/trace/ftp-master.debian.org dak import-users-from-passwd -dak queue-report -n -8 > $webdir/new.html +dak queue-report -n > $webdir/new.html +dak queue-report -8 -d accepted,new,byhand,proposedupdates dak show-deferred > ${webdir}/deferred.html cd $queuedir/new ; dak show-new *.changes > /dev/null $base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc diff --git a/dak/queue_report.py b/dak/queue_report.py index 31b11d8d..9e73d1c3 100755 --- a/dak/queue_report.py +++ b/dak/queue_report.py @@ -58,6 +58,7 @@ Prints a report of packages in queue directories (usually new and byhand). -s, --sort=key sort output according to key, see below. -a, --age=key if using sort by age, how should time be treated? If not given a default of hours will be used. + -d, --directories=key A comma seperated list of queues to be scanned Sorting Keys: ao=age, oldest first. an=age, newest first. na=name, ascending nd=name, descending @@ -515,7 +516,8 @@ def main(): ('n',"new","Queue-Report::Options::New"), ('8','822',"Queue-Report::Options::822"), ('s',"sort","Queue-Report::Options::Sort", "HasArg"), - ('a',"age","Queue-Report::Options::Age", "HasArg")] + ('a',"age","Queue-Report::Options::Age", "HasArg"), + ('d',"directories","Queue-Report::Options::Directories", "HasArg")] for i in [ "help" ]: if not Cnf.has_key("Queue-Report::Options::%s" % (i)): Cnf["Queue-Report::Options::%s" % (i)] = "" @@ -531,8 +533,14 @@ def main(): if Cnf.has_key("Queue-Report::Options::New"): header() - directories = Cnf.ValueList("Queue-Report::Directories") - if not directories: + directories = [ ] + + if Cnf.has_key("Queue-Report::Options::Directories"): + for i in Cnf["Queue-Report::Options::Directories"].split(","): + directories.append(i) + elif Cnf.has_key("Queue-Report::Directories"): + directories = Cnf.ValueList("Queue-Report::Directories") + else: directories = [ "byhand", "new" ] f = None