X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcruft_report.py;h=5a2abd61c2a5f77111839d5c1c4d7ce4a7a8fea8;hb=61a732364e29b4db275baad97ca346f7dc160e50;hp=866c28d83bceedf1e054ab0329d8391ba2f6b0a1;hpb=ac07da16a0b098e7aa41b045b34152f4c7cc578b;p=dak.git

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 866c28d8..5a2abd61 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -167,7 +167,7 @@ def parse_nfu(architecture):
 
         f.close()
     else:
-        warn("No wanna-build dump file for architecture %s", architecture)
+        utils.warn("No wanna-build dump file for architecture %s", architecture)
     return ret
 
 ################################################################################
@@ -182,8 +182,8 @@ SELECT s.source, s.version AS experimental, s2.version AS unstable
   FROM src_associations sa, source s, source s2, src_associations sa2
   WHERE sa.suite = %s AND sa2.suite = %d AND sa.source = s.id
    AND sa2.source = s2.id AND s.source = s2.source
-   AND versioncmp(s.version, s2.version) < 0""" % (experimental_id,
-                                                   database.get_suite_id("unstable")))
+   AND s.version < s2.version""" % (experimental_id,
+                                    database.get_suite_id("unstable")))
     ql = q.getresult()
     if ql:
         nviu_to_remove = []
@@ -332,7 +332,7 @@ def main ():
         Cnf["Cruft-Report::Options::Mode"] = "daily"
 
     if not Cnf.has_key("Cruft-Report::Options::Wanna-Build-Dump"):
-        Cnf["Cruft-Report::Options::Wanna-Build-Dump"] = "/srv/ftp.debian.org/scripts/nfu/"
+        Cnf["Cruft-Report::Options::Wanna-Build-Dump"] = "/srv/ftp.debian.org/scripts/nfu"
 
     apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
 
@@ -435,8 +435,9 @@ def main ():
                 sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output))
                 sys.exit(result)
 
-            nfu_packages.setdefault(architecture,[])
-            nfu_entries = parse_nfu(architecture)
+            if "nfu" in checks:
+                nfu_packages.setdefault(architecture,[])
+                nfu_entries = parse_nfu(architecture)
 
             packages = utils.open_file(temp_filename)
             Packages = apt_pkg.ParseTagFile(packages)
@@ -471,9 +472,10 @@ def main ():
                         duplicate_bins.setdefault(key, [])
                         if package not in duplicate_bins[key]:
                             duplicate_bins[key].append(package)
-                    if package in nfu_entries and \
-                        version != source_versions[source]: # only suggest to remove out-of-date packages
-                        nfu_packages[architecture].append((package,version,source_versions[source]))
+                    if "nfu" in checks:
+                        if package in nfu_entries and \
+                               version != source_versions[source]: # only suggest to remove out-of-date packages
+                            nfu_packages[architecture].append((package,version,source_versions[source]))
                     
             packages.close()
             os.unlink(temp_filename)