Merge branch 'master' into dm_upload_allowed

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ec9bdc0f73ed2df442ddeb89016ed5148a915f1e..946cf32a3caa4a8a6da3801a4c5222d4d39d38aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,24 +1,11 @@
-2008-12-29  Michael Casadevall  <sonicmctails@gmail.com>
+2008-12-30  Joerg Jaspert  <joerg@debian.org>
 
-       * 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  <sonicmctails@gmail.com>
+2008-12-30  Michael Casadevall <sonicmctails@gmail.com>
 
-        * 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  <djpig@debian.org>
 
@@ -26,28 +13,7 @@
 
 2008-12-26  Michael Casadevall <sonicmctails@gmail.com>
 
-        * 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 <sonicmctails@gmail.com>
 

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 3ff3f7d53370b5b92c17e6a7e05f75ebf18b22f7..e543434a9f5e24ca98b0c854043d8f01938b7105 100755 (executable)
--- 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 31b11d8dd0c0957f0eafa22c4b5279c0c942d263..9e73d1c3e5b26a4773f07727560492bd31764dfa 100755 (executable)
--- 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