X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=590d48fc66f333d0df9f9ff69ae0f11fed381b1f;hb=bdc4c1b3239f0630aaf79dec450ef71534bac8b9;hp=944a46e6a0b1e5811387058e3b90743bed82a1c5;hpb=9e68d19cf842cd942e03c37ecb3228730585ebc8;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index 944a46e6..590d48fc 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -98,32 +98,32 @@ def game_over():
 
 ################################################################################
 
-def reverse_depends_check(removals, suites, arches=None):
+def reverse_depends_check(removals, suite, arches=None):
     cnf = Config()
 
     print "Checking reverse dependencies..."
-    components = cnf.ValueList("Suite::%s::Components" % suites[0])
+    components = get_component_names()
     dep_problem = 0
     p2c = {}
     all_broken = {}
     if arches:
         all_arches = set(arches)
     else:
-        all_arches = set([x.arch_string for x in get_suite_architectures(suites[0])])
+        all_arches = set([x.arch_string for x in get_suite_architectures(suite)])
     all_arches -= set(["source", "all"])
     for architecture in all_arches:
         deps = {}
         sources = {}
         virtual_packages = {}
         for component in components:
-            filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (cnf["Dir::Root"], suites[0], component, architecture)
+            filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (cnf["Dir::Root"], suite, component, architecture)
             # apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance...
             (fd, temp_filename) = utils.temp_filename()
             (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename))
             if (result != 0):
                 utils.fubar("Gunzip invocation failed!\n%s\n" % (output), result)
             # Also check for udebs
-            filename = "%s/dists/%s/%s/debian-installer/binary-%s/Packages.gz" % (cnf["Dir::Root"], suites[0], component, architecture)
+            filename = "%s/dists/%s/%s/debian-installer/binary-%s/Packages.gz" % (cnf["Dir::Root"], suite, component, architecture)
             if os.path.exists(filename):
                 (result, output) = commands.getstatusoutput("gunzip -c %s >> %s" % (filename, temp_filename))
                 if (result != 0):
@@ -207,7 +207,7 @@ def reverse_depends_check(removals, suites, arches=None):
     # Check source dependencies (Build-Depends and Build-Depends-Indep)
     all_broken.clear()
     for component in components:
-        filename = "%s/dists/%s/%s/source/Sources.gz" % (cnf["Dir::Root"], suites[0], component)
+        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...
         (fd, temp_filename) = utils.temp_filename()
         result, output = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename))
@@ -368,8 +368,8 @@ def main ():
             s = get_suite(suite, session=session)
             if s is not None:
                 suite_ids_list.append(s.suite_id)
-            if suite == "stable":
-                print "**WARNING** About to remove from the stable suite!"
+            if suite in ("oldstable", "stable"):
+                print "**WARNING** About to remove from the (old)stable suite!"
                 print "This should only be done just prior to a (point) release and not at"
                 print "any other time."
                 game_over()
@@ -386,6 +386,10 @@ def main ():
     # Additional component processing
     over_con_components = con_components.replace("c.id", "component")
 
+    # Don't do dependency checks on multiple suites
+    if Options["Rdep-Check"] and len(suites) > 1:
+        utils.fubar("Reverse dependency check on multiple suites is not implemented.")
+
     print "Working...",
     sys.stdout.flush()
     to_remove = []
@@ -508,7 +512,7 @@ def main ():
 
     if Options["Rdep-Check"]:
         arches = utils.split_args(Options["Architecture"])
-        reverse_depends_check(removals, suites, arches)
+        reverse_depends_check(removals, suites[0], arches)
 
     # If -n/--no-action, drop out here
     if Options["No-Action"]: