[dak/master] Added directories option to the queue report
Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>
---
ChangeLog | 4 ++++
dak/queue_report.py | 14 +++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d550ecd..69a0efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-30 Michael Casadevall <sonicmctails@gmail.com>
+
+ * dak/queue_report.py - Added directories option to queue report
+
2008-12-28 Frank Lichtenheld <djpig@debian.org>
* dak/override.py (main): Handle source-only packages better
diff --git a/dak/queue_report.py b/dak/queue_report.py
index 31b11d8..cdc489c 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 directories 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
--
1.5.6.5
Reply to: