Call it hourly with -8

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 59f1b7f404f1ca4479acd0e43beb4c398d175523..ce88d09ffc235acd4f9531dad344cf896bf7261e 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -291,7 +291,7 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
 
 ############################################################
 
-def process_changes_files(changes_files, type):
+def process_changes_files(changes_files, type, log):
     msg = ""
     cache = {}
     # Read in all the .changes files
@@ -357,7 +357,7 @@ def process_changes_files(changes_files, type):
         arches = {}
         versions = {}
         for j in i[1]["list"]:
-            if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options:822"):
+            if Cnf.has_key("Queue-Report::Options::New") or Cnf.has_key("Queue-Report::Options::822"):
                 try:
                     (maintainer["maintainer822"], maintainer["maintainer2047"],
                     maintainer["maintainername"], maintainer["maintaineremail"]) = \
@@ -438,42 +438,38 @@ def process_changes_files(changes_files, type):
     # have with it. (If you combine options it will simply take the last one at the moment).
     # Will be enhanced in the future.
 
-    if Cnf.has_key("Queue-Report::Options:822"):
-        # Open the report file
-        f = open(Cnf["Queue-Report::ReportLocations::822Location"], "w")
-
+    if Cnf.has_key("Queue-Report::Options::822"):
         # print stuff out in 822 format
         for entry in entries:
             (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry
 
             # We'll always have Source, Version, Arch, Mantainer, and Dist
             # For the rest, check to see if we have them, then print them out
-            f.write("Source: " + source + "\n")
-            f.write("Version: " + version_list + "\n")
-            f.write("Architectures:")
-            f.write( (", ".join(arch_list.split(" "))) + "\n")
-            f.write("Age: " + time_pp(last_modified) + "\n")
+            log.write("Source: " + source + "\n")
+            log.write("Version: " + version_list + "\n")
+            log.write("Architectures: ")
+            log.write( (", ".join(arch_list.split(" "))) + "\n")
+            log.write("Age: " + time_pp(last_modified) + "\n")
+            log.write("Queue: " + type + "\n")
 
             (name, mail) = maint.split(":")
-            f.write("Maintainer: " + name + " <"+mail+">" + "\n")
+            log.write("Maintainer: " + name + " <"+mail+">" + "\n")
             if changedby:
                (name, mail) = changedby.split(":")
-               f.write("Changed-By: " + name + " <"+mail+">" + "\n")
+               log.write("Changed-By: " + name + " <"+mail+">" + "\n")
             if sponsor:
-               (name, mail) = sponsor.split(":")
-               f.write("Sponsored-By: " + name + " <"+mail+">" + "\n")
-            f.write("Distribution:")
+               log.write("Sponsored-By: " + sponsor + "\n")
+            log.write("Distribution:")
             for dist in distribution:
-               f.write(" " + dist)
-            f.write("\n")
-            f.write("Fingerprint: " + fingerprint + "\n")
+               log.write(" " + dist)
+            log.write("\n")
+            log.write("Fingerprint: " + fingerprint + "\n")
             if closes:
                 bug_string = ""
                 for bugs in closes:
                     bug_string += "#"+bugs+", "
-                f.write("Closes: " + bug_string[:-2] + "\n")
-            f.write("\n")
-        f.close()
+                log.write("Closes: " + bug_string[:-2] + "\n")
+            log.write("\n")
 
     if Cnf.has_key("Queue-Report::Options::New"):
         direction.append([4,1,"ao"])
@@ -488,7 +484,7 @@ def process_changes_files(changes_files, type):
                 (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry
                 table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby)
             table_footer(type.upper())
-    elif not Cnf.has_key("Queue-Report::Options:822"):
+    elif not Cnf.has_key("Queue-Report::Options::822"):
     # The "normal" output without any formatting.
         format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old\n" % (max_source_len, max_version_len, max_arch_len)
 
@@ -516,7 +512,7 @@ def main():
     Cnf = utils.get_conf()
     Arguments = [('h',"help","Queue-Report::Options::Help"),
                  ('n',"new","Queue-Report::Options::New"),
-                 ('8','822',"Queue-Report::Options:822"),
+                 ('8','822',"Queue-Report::Options::822"),
                  ('s',"sort","Queue-Report::Options::Sort", "HasArg"),
                  ('a',"age","Queue-Report::Options::Age", "HasArg")]
     for i in [ "help" ]:
@@ -538,9 +534,17 @@ def main():
     if not directories:
         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")
+
     for directory in directories:
         changes_files = glob.glob("%s/*.changes" % (Cnf["Dir::Queue::%s" % (directory)]))
-        process_changes_files(changes_files, directory)
+        process_changes_files(changes_files, directory, f)
+
+    if Cnf.has_key("Queue-Report::Options::822"):
+        f.close()
 
     if Cnf.has_key("Queue-Report::Options::New"):
         footer()