From: Mike O'Connor <stew@vireo.org>
Date: Tue, 14 Apr 2009 12:23:51 +0000 (-0400)
Subject: Merge branch 'master' into content_generation
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3e78a91b9b895b5f2f54b7c40b096797733873f7;hp=275962c383557fc7e83c1c0bce6fe81a23d3ebb0;p=dak.git

Merge branch 'master' into content_generation
---

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 4c6d323e..30650d41 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -206,7 +206,7 @@ def do_nbs(real_nbs):
     output = "Not Built from Source\n"
     output += "---------------------\n\n"
 
-    nbs_to_remove = []
+    cmd_output = ""
     nbs_keys = real_nbs.keys()
     nbs_keys.sort()
     for source in nbs_keys:
@@ -216,21 +216,22 @@ def do_nbs(real_nbs):
         output += "      but no longer builds:\n"
         versions = real_nbs[source].keys()
         versions.sort(apt_pkg.VersionCompare)
+        all_packages = []
         for version in versions:
             packages = real_nbs[source][version].keys()
             packages.sort()
-            for pkg in packages:
-                nbs_to_remove.append(pkg)
+            all_packages.extend(packages)
             output += "        o %s: %s\n" % (version, ", ".join(packages))
+        if all_packages:
+            all_packages.sort()
+            cmd_output += " dak rm -m \"[auto-cruft] NBS (was built by %s)\" -s %s -b %s\n\n" % (source, suite, " ".join(all_packages))
 
         output += "\n"
 
-    if nbs_to_remove:
+    if len(cmd_output):
         print output
-
-        print "Suggested command:"
-        print " dak rm -m \"[auto-cruft] NBS\" -s %s -b %s" % (suite, " ".join(nbs_to_remove))
-        print
+        print "Suggested commands:\n"
+        print cmd_output
 
 ################################################################################