X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcruft_report.py;h=384ad0e7d3ddbc71abf71fa38bc280d32ad00d85;hb=2e37e696ba3b6eb5401727a2dad2288687bb2f5b;hp=73619d590395bb00f189fbdc6e5b7f0bd377fbaa;hpb=7510b46d831c1cb1bb0c603db885745033771c33;p=dak.git

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 73619d59..384ad0e7 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -272,47 +272,64 @@ def do_dubious_nbs(dubious_nbs):
 
 ################################################################################
 
-def do_obsolete_source(duplicate_bins, bin2source):
-    obsolete = {}
-    for key in duplicate_bins.keys():
-        (source_a, source_b) = key.split('_')
-        for source in [ source_a, source_b ]:
-            if not obsolete.has_key(source):
-                if not source_binaries.has_key(source):
-                    # Source has already been removed
-                    continue
-                else:
-                    obsolete[source] = [ i.strip() for i in source_binaries[source].split(',') ]
-            for binary in duplicate_bins[key]:
-                if bin2source.has_key(binary) and bin2source[binary]["source"] == source:
-                    continue
-                if binary in obsolete[source]:
-                    obsolete[source].remove(binary)
-
-    to_remove = []
-    output = "Obsolete source package\n"
-    output += "-----------------------\n\n"
-    obsolete_keys = obsolete.keys()
-    obsolete_keys.sort()
-    for source in obsolete_keys:
-        if not obsolete[source]:
-            to_remove.append(source)
-            output += " * %s (%s)\n" % (source, source_versions[source])
-            for binary in [ i.strip() for i in source_binaries[source].split(',') ]:
-                if bin2source.has_key(binary):
-                    output += "    o %s (%s) is built by %s.\n" \
-                          % (binary, bin2source[binary]["version"],
-                             bin2source[binary]["source"])
-                else:
-                    output += "    o %s is not built.\n" % binary
-            output += "\n"
-
-    if to_remove:
-        print output
-
-        print "Suggested command:"
-        print " dak rm -S -p -m \"[auto-cruft] obsolete source package\" %s" % (" ".join(to_remove))
-        print
+def obsolete_source(suite_name, session):
+    """returns obsolete source packages for suite_name sorted by
+    install_date"""
+
+    query = """
+SELECT os.src, os.source, os.version, os.install_date
+    FROM obsolete_source os
+    JOIN suite s on s.id = os.suite
+    WHERE s.suite_name = :suite_name
+    ORDER BY install_date"""
+    args = { 'suite_name': suite_name }
+    return session.execute(query, args)
+
+def source_bin(source, session):
+    """returns binaries built by source for all or no suite"""
+
+    query = """
+SELECT package
+    FROM source_bin
+    WHERE source = :source
+    ORDER BY package"""
+    args = { 'source': source }
+    return session.execute(query, args)
+
+def newest_source_bab(suite_name, package, session):
+    """returns newest source that builds binary package in suite"""
+
+    query = """
+SELECT source, srcver
+    FROM newest_source_bab nsb
+    JOIN suite s on s.id = nsb.suite
+    WHERE s.suite_name = :suite_name AND nsb.package = :package
+    ORDER BY source"""
+    args = { 'suite_name': suite_name, 'package': package }
+    return session.execute(query, args)
+
+def report_obsolete_source(suite_name, session):
+    rows = obsolete_source(suite_name, session)
+    if rows.rowcount == 0:
+        return
+    print \
+"""Obsolete source packages in suite %s
+----------------------------------%s\n""" % \
+        (suite_name, '-' * len(suite_name))
+    for os_row in rows.fetchall():
+        (src, old_source, version, install_date) = os_row
+        print " * obsolete source %s version %s installed at %s" % \
+            (old_source, version, install_date)
+        for sb_row in source_bin(old_source, session):
+            (package, ) = sb_row
+            print "   - has built binary %s" % package
+            for nsb_row in newest_source_bab(suite_name, package, session):
+                (new_source, srcver) = nsb_row
+                print "     currently built by source %s version %s" % \
+                    (new_source, srcver)
+        print "   - suggested command:"
+        rm_opts = "-S -p -m \"[auto-cruft] obsolete source package\""
+        print "     dak rm -s %s %s %s\n" % (suite_name, rm_opts, old_source)
 
 def get_suite_binaries(suite, session):
     # Initalize a large hash table of all binary packages
@@ -358,9 +375,7 @@ def main ():
 
     # Set up checks based on mode
     if Options["Mode"] == "daily":
-        checks = [ "nbs", "nviu", "nvit" ]
-        # 'obsolete source' is broken since the introduction of dak dominate
-        #checks = [ "nbs", "nviu", "nvit", "obsolete source" ]
+        checks = [ "nbs", "nviu", "nvit", "obsolete source" ]
     elif Options["Mode"] == "full":
         checks = [ "nbs", "nviu", "nvit", "obsolete source", "nfu", "dubious nbs", "bnb", "bms", "anais" ]
     else:
@@ -385,6 +400,9 @@ def main ():
     suite_id = suite.suite_id
     suite_name = suite.suite_name.lower()
 
+    if "obsolete source" in checks:
+        report_obsolete_source(suite_name, session)
+
     bin_not_built = {}
 
     if "bnb" in checks:
@@ -503,9 +521,6 @@ def main ():
             packages.close()
             os.unlink(temp_filename)
 
-    if "obsolete source" in checks:
-        do_obsolete_source(duplicate_bins, bin2source)
-
     # Distinguish dubious (version numbers match) and 'real' NBS (they don't)
     dubious_nbs = {}
     real_nbs = {}