X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcruft_report.py;h=5b199dcab8de5756ec347f9ef96f349f63ae8025;hb=2c345145c5984f3cc9ea995da4c510c600237a35;hp=aac0d454b5af68cbf1c717eab68c2fc905bbd08e;hpb=12aa4c9ae0c805b3c07eee1d7873e1d513010e98;p=dak.git

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index aac0d454..5b199dca 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -35,16 +35,6 @@ Check for obsolete binary packages
 
 ################################################################################
 
-import warnings
-warnings.filterwarnings('ignore', \
-    "apt_pkg\.ParseTagFile\(\) is deprecated\. Please see apt_pkg\.TagFile\(\) for the replacement\.", \
-    DeprecationWarning)
-warnings.filterwarnings('ignore', \
-    "Attribute '.*' of the 'apt_pkg\.TagFile' object is deprecated, use '.*' instead\.", \
-    DeprecationWarning)
-
-################################################################################
-
 import commands, os, sys, re
 import apt_pkg
 
@@ -528,7 +518,8 @@ def main ():
     for i in [ "help" ]:
         if not cnf.has_key("Cruft-Report::Options::%s" % (i)):
             cnf["Cruft-Report::Options::%s" % (i)] = ""
-    cnf["Cruft-Report::Options::Suite"] = cnf["Dinstall::DefaultSuite"]
+
+    cnf["Cruft-Report::Options::Suite"] = cnf.get("Dinstall::DefaultSuite", "unstable")
 
     if not cnf.has_key("Cruft-Report::Options::Mode"):
         cnf["Cruft-Report::Options::Mode"] = "daily"
@@ -580,7 +571,7 @@ def main ():
         bins_in_suite = get_suite_binaries(suite, session)
 
     # Checks based on the Sources files
-    components = cnf.ValueList("Suite::%s::Components" % (suite_name))
+    components = get_component_names(session)
     for component in components:
         filename = "%s/dists/%s/%s/source/Sources.gz" % (cnf["Dir::Root"], suite_name, component)
         # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance...