Merge branch 'master' into security

[dak.git] / dak / cruft_report.py

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 058c3d45ec2d95324ef60ae60334c1e06910d9d3..fab47bf056d72bf910fd774ed48c45e584487ce6 100755 (executable)
--- 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
 
 ################################################################################
@@ -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"] = "./wanna-build-dump"
+        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)