Added directories option to the queue report

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index ea0802a8a6476630f288e0d109c1d71462753a0a..cdc489c855f2e8a59173216109b4b614399c2a6a 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 directories to be scanned
 
      Sorting Keys: ao=age,   oldest first.   an=age,   newest first.
                    na=name,  ascending       nd=name,  descending
@@ -450,6 +451,7 @@ def process_changes_files(changes_files, type, log):
             log.write("Architectures: ")
             log.write( (", ".join(arch_list.split(" "))) + "\n")
             log.write("Age: " + time_pp(last_modified) + "\n")
+            log.write("Last-Modified: " + str(int(time.time()) - int(last_modified)) + "\n")
             log.write("Queue: " + type + "\n")
 
             (name, mail) = maint.split(":")
@@ -514,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)] = ""
@@ -530,10 +533,17 @@ 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
     if Cnf.has_key("Queue-Report::Options::822"):
         # Open the report file
         f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w")