X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcruft_report.py;h=d88c799b019d857ecaf689530a2ce6174e58a994;hb=cd5b29ddfd8de263c085f494b9573d683913f6f3;hp=058c3d45ec2d95324ef60ae60334c1e06910d9d3;hpb=ed9f6be584d448d1705ee02e18ca134fc6aab450;p=dak.git

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 058c3d45..d88c799b 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Check for obsolete binary packages
+""" Check for obsolete binary packages """
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -31,6 +31,7 @@ import commands, pg, os, sys, time, re
 import apt_pkg
 from daklib import database
 from daklib import utils
+from daklib.regexes import re_extract_src_version
 
 ################################################################################
 
@@ -167,7 +168,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 +183,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 +333,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)
 
@@ -377,7 +378,7 @@ def main ():
     for component in components:
         filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suite, component)
         # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance...
-        temp_filename = utils.temp_filename()
+        (fd, temp_filename) = utils.temp_filename()
         (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename))
         if (result != 0):
             sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output))
@@ -429,14 +430,15 @@ def main ():
         for architecture in architectures:
             filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (Cnf["Dir::Root"], suite, component, architecture)
             # apt_pkg.ParseTagFile needs a real file handle
-            temp_filename = utils.temp_filename()
+            (fd, temp_filename) = utils.temp_filename()
             (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename))
             if (result != 0):
                 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)
@@ -455,7 +457,7 @@ def main ():
                     bin2source[package]["version"] = version
                     bin2source[package]["source"] = source
                 if source.find("(") != -1:
-                    m = utils.re_extract_src_version.match(source)
+                    m = re_extract_src_version.match(source)
                     source = m.group(1)
                     version = m.group(2)
                 if not bin_pkgs.has_key(package):
@@ -471,9 +473,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)