Replace os.popen with the subprocess.Popen in a few places.

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index a8f741026155e955a56b9876d1eafa9a3652fd26..7e4e14745706027a31734c054fb1ec20827f849f 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -47,7 +47,7 @@ from daklib.dbconn import DBConn, DBSource, has_new_comment, PolicyQueue, \
                           get_uid_from_fingerprint
 from daklib.policy import PolicyQueueUploadHandler
 from daklib.textutils import fix_maintainer
-from daklib.utils import get_login_from_ldap
+from daklib.utils import get_logins_from_ldap
 from daklib.dak_exceptions import *
 
 Cnf = None
@@ -117,7 +117,15 @@ def time_pp(x):
 def sg_compare (a, b):
     a = a[1]
     b = b[1]
-    """Sort by have note, time of oldest upload."""
+    """Sort by have pending action, have note, time of oldest upload."""
+    # Sort by have pending action
+    a_note_state = a["processed"]
+    b_note_state = b["processed"]
+    if a_note_state < b_note_state:
+        return -1
+    elif a_note_state > b_note_state:
+        return 1
+
     # Sort by have note
     a_note_state = a["note_state"]
     b_note_state = b["note_state"]
@@ -375,6 +383,7 @@ def process_queue(queue, log, rrd_dir):
 
     # Divide the .changes into per-source groups
     per_source = {}
+    total_pending = 0
     for upload in queue.uploads:
         source = upload.changes.source
         if source not in per_source:
@@ -383,8 +392,10 @@ def process_queue(queue, log, rrd_dir):
             per_source[source]["processed"] = ""
             handler = PolicyQueueUploadHandler(upload, session)
             if handler.get_action():
-                per_source[source]["processed"] = " | PENDING %s" % handler.get_action()
+                per_source[source]["processed"] = "PENDING %s" % handler.get_action()
+                total_pending += 1
         per_source[source]["list"].append(upload)
+        per_source[source]["list"].sort(lambda x, y: cmp(x.changes.created, y.changes.created), reverse=True)
     # Determine oldest time and have note status for each source group
     for source in per_source.keys():
         source_list = per_source[source]["list"]
@@ -399,7 +410,7 @@ def process_queue(queue, log, rrd_dir):
             else:
                 if mtime < oldest:
                     oldest = mtime
-            have_note += has_new_comment(d.changes.source, d.changes.version)
+            have_note += has_new_comment(d.policy_queue, d.changes.source, d.changes.version)
         per_source[source]["oldest"] = oldest
         if not have_note:
             per_source[source]["note_state"] = 0; # none
@@ -416,6 +427,10 @@ def process_queue(queue, log, rrd_dir):
     max_source_len = 0
     max_version_len = 0
     max_arch_len = 0
+    try:
+        logins = get_logins_from_ldap()
+    except:
+        logins = dict()
     for i in per_source_items:
         maintainer = {}
         maint=""
@@ -466,7 +481,8 @@ def process_queue(queue, log, rrd_dir):
                 sponsor_name = get_uid_from_fingerprint(fingerprint).name
                 sponsor_login = get_uid_from_fingerprint(fingerprint).uid
                 if '@' in sponsor_login:
-                    sponsor_login = get_login_from_ldap(fingerprint)
+                    if fingerprint in logins:
+                        sponsor_login = logins[fingerprint]
                 if (sponsor_name != maintainer["maintainername"] and
                   sponsor_name != changeby["changedbyname"] and
                   sponsor_login + '@debian.org' != maintainer["maintaineremail"] and
@@ -479,7 +495,7 @@ def process_queue(queue, log, rrd_dir):
         arches_list = list(arches)
         arches_list.sort(utils.arch_compare_sw)
         arch_list = " ".join(arches_list)
-        version_list = " ".join(versions)
+        version_list = " ".join(sorted(versions, reverse=True))
         if len(version_list) > max_version_len:
             max_version_len = len(version_list)
         if len(arch_list) > max_arch_len:
@@ -579,19 +595,25 @@ def process_queue(queue, log, rrd_dir):
             table_footer(type.upper())
     elif not Cnf.has_key("Queue-Report::Options::822"):
     # The "normal" output without any formatting.
-        format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old%%s\n" % (max_source_len, max_version_len, max_arch_len)
-
         msg = ""
         for entry in entries:
             (source, binary, version_list, arch_list, processed, note, last_modified, undef, undef, undef, undef, undef, undef, undef) = entry
-            msg += format % (source, version_list, arch_list, note, time_pp(last_modified), processed)
+            if processed:
+                format="%%-%ds | %%-%ds | %%-%ds | %%s\n" % (max_source_len, max_version_len, max_arch_len)
+                msg += format % (source, version_list, arch_list, processed)
+            else:
+                format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old\n" % (max_source_len, max_version_len, max_arch_len)
+                msg += format % (source, version_list, arch_list, note, time_pp(last_modified))
 
         if msg:
             print type.upper()
             print "-"*len(type)
             print
             print msg
-            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 ("%s %s source package%s / %s %s package%s in total / %s %s package%s to be processed." %
+                   (source_count, type, plural(source_count),
+                    total_count, type, plural(total_count),
+                    total_pending, type, plural(total_pending)))
             print
 
 ################################################################################