Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 862a6d20ebb8a431ebc4bfc8288c721f852cde65..9de1f5459dbfa4ac72f63cc1e861026f71609138 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -370,6 +370,7 @@ RRA:MAX:0.5:288:795
 def process_changes_files(changes_files, type, log, rrd_dir):
     msg = ""
     cache = {}
+    unprocessed = []
     # Read in all the .changes files
     for filename in changes_files:
         try:
@@ -383,6 +384,9 @@ def process_changes_files(changes_files, type, log, rrd_dir):
     # Divide the .changes into per-source groups
     per_source = {}
     for filename in cache.keys():
+       if not cache[filename].has_key("source"):
+            unprocessed.append(filename)
+            continue
         source = cache[filename]["source"]
         if not per_source.has_key(source):
             per_source[source] = {}
@@ -601,6 +605,12 @@ def process_changes_files(changes_files, type, log, rrd_dir):
             print "%s %s source package%s / %s %s package%s in total." % (source_count, type, plural(source_count), total_count, type, plural(total_count))
             print
 
+        if len(unprocessed):
+            print "UNPROCESSED"
+            print "-----------"
+            for u in unprocessed:
+                print u
+            print
 
 ################################################################################
 
@@ -619,9 +629,9 @@ def main():
         if not Cnf.has_key("Queue-Report::Options::%s" % (i)):
             Cnf["Queue-Report::Options::%s" % (i)] = ""
 
-    apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
+    apt_pkg.parse_commandline(Cnf, Arguments, sys.argv)
 
-    Options = Cnf.SubTree("Queue-Report::Options")
+    Options = Cnf.subtree("Queue-Report::Options")
     if Options["Help"]:
         usage()
 
@@ -637,7 +647,7 @@ def main():
         for i in Cnf["Queue-Report::Options::Directories"].split(","):
             queue_names.append(i)
     elif Cnf.has_key("Queue-Report::Directories"):
-        queue_names = Cnf.ValueList("Queue-Report::Directories")
+        queue_names = Cnf.value_list("Queue-Report::Directories")
     else:
         queue_names = [ "byhand", "new" ]