X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcruft_report.py;h=8571bcf4c5fdeefb316c0f9da776f06b70a0ce12;hb=d01b87da9158bfdc35fdb0628556fd3c9bb49eae;hp=c8183aaeb810182105c9d23bde527d159b08c516;hpb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;p=dak.git

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index c8183aae..8571bcf4 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -23,11 +23,11 @@
 #   you might as well write some letters to God about how unfair entropy
 #   is while you're at it.'' -- 20020802143104.GA5628@azure.humbug.org.au
 
-## TODO:  fix NBS looping for version, implement Dubious NBS, fix up output of duplicate source package stuff, improve experimental ?, add support for non-US ?, add overrides, avoid ANAIS for duplicated packages
+## TODO:  fix NBS looping for version, implement Dubious NBS, fix up output of duplicate source package stuff, improve experimental ?, add overrides, avoid ANAIS for duplicated packages
 
 ################################################################################
 
-import commands, pg, os, string, sys, time
+import commands, pg, os, sys, time
 import apt_pkg
 import daklib.database
 import daklib.utils
@@ -202,15 +202,14 @@ 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('~')
+        (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] = map(string.strip,
-                                           source_binaries[source].split(','))
+                    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
@@ -226,7 +225,7 @@ def do_obsolete_source(duplicate_bins, bin2source):
         if not obsolete[source]:
             to_remove.append(source)
             output += " * %s (%s)\n" % (source, source_versions[source])
-            for binary in map(string.strip, source_binaries[source].split(',')):
+            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"],
@@ -320,7 +319,7 @@ def main ():
             source_version = Sources.Section.Find('Version')
             architecture = Sources.Section.Find('Architecture')
             binaries = Sources.Section.Find('Binary')
-            binaries_list = map(string.strip, binaries.split(','))
+            binaries_list = [ i.strip() for i in  binaries.split(',') ]
 
             if "bnb" in checks:
                 # Check for binaries not built on any architecture.
@@ -341,7 +340,7 @@ def main ():
                 if bin_pkgs.has_key(binary):
                     key_list = [ source, bin_pkgs[binary] ]
                     key_list.sort()
-                    key = '~'.join(key_list)
+                    key = '_'.join(key_list)
                     duplicate_bins.setdefault(key, [])
                     duplicate_bins[key].append(binary)
                 bin_pkgs[binary] = source
@@ -391,7 +390,7 @@ def main ():
                     if previous_source != source:
                         key_list = [ source, previous_source ]
                         key_list.sort()
-                        key = '~'.join(key_list)
+                        key = '_'.join(key_list)
                         duplicate_bins.setdefault(key, [])
                         if package not in duplicate_bins[key]:
                             duplicate_bins[key].append(package)
@@ -446,7 +445,7 @@ def main ():
         keys = duplicate_bins.keys()
         keys.sort()
         for key in keys:
-            (source_a, source_b) = key.split("~")
+            (source_a, source_b) = key.split("_")
             print " o %s & %s => %s" % (source_a, source_b, ", ".join(duplicate_bins[key]))
         print