Merge remote-tracking branch 'ansgar/pu/multiarchive-2'

* ansgar/pu/multiarchive-2:
  dak/queue_report.py: use right variable
  dak/generate_releases.py: handle empty list of signingkeys

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index fe843efa73831e1c5eecdc3651b0d4ef8acde087..72fb4304e1b99571e05bcebc5789b9a7ab1c1cd6 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -98,7 +98,7 @@ def sign_release_dir(suite, dirname):
         # the array for consistency
         firstkey = True
 
-        for keyid in suite.signingkeys:
+        for keyid in suite.signingkeys or []:
             defkeyid = "--default-key %s" % keyid
 
             os.system("gpg %s %s %s --detach-sign <%s >>%s" %

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 77e1e53c230d9ff216faf9b5806ac882775e9faa..8152bfa63e7e9c4cabe85754dc8a7aa1059bc334 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -553,13 +553,13 @@ def process_queue(queue, log, rrd_dir):
             log.write("\n")
 
     if Cnf.has_key("Queue-Report::Options::New"):
+        total_count = len(queue.uploads)
+        source_count = len(per_source_items)
         direction.append([5,1,"ao"])
         entries.sort(lambda x, y: sortfunc(x, y))
     # Output for a html file. First table header. then table_footer.
     # Any line between them is then a <tr> printed from subroutine table_row.
         if len(entries) > 0:
-            total_count = len(changes_files)
-            source_count = len(per_source_items)
             table_header(type.upper(), source_count, total_count)
             for entry in entries:
                 (source, binary, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby, undef) = entry
@@ -575,8 +575,6 @@ def process_queue(queue, log, rrd_dir):
             msg += format % (source, version_list, arch_list, note, time_pp(last_modified))
 
         if msg:
-            total_count = len(queue.uploads)
-            source_count = len(per_source_items)
             print type.upper()
             print "-"*len(type)
             print