Ups, forgot to kick the import

[dak.git] / dak / make_suite_file_list.py

diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index 7d10d42ba2942b91c9d15d67de58b4da7e01a21f..41e6cb33b9765a699ae488db77eab7bc942b097e 100755 (executable)
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -35,7 +35,6 @@
 
 import copy, os, pg, sys
 import apt_pkg
-import symlink_dists
 from daklib import database
 from daklib import logging
 from daklib import utils
@@ -331,27 +330,6 @@ def write_filelists(packages, dislocated_files):
 
 ################################################################################
 
-# Want to use stable dislocation support: True or false?
-def stable_dislocation_p():
-    # If the support is not explicitly enabled, assume it's disabled
-    if not Cnf.FindB("Dinstall::StableDislocationSupport"):
-        return 0
-    # If we don't have a stable suite, obviously a no-op
-    if not Cnf.has_key("Suite::Stable"):
-        return 0
-    # If the suite(s) weren't explicitly listed, all suites are done
-    if not Options["Suite"]:
-        return 1
-    # Otherwise, look in what suites the user specified
-    suites = utils.split_args(Options["Suite"])
-
-    if "stable" in suites:
-        return 1
-    else:
-        return 0
-
-################################################################################
-
 def do_da_do_da():
     # If we're only doing a subset of suites, ensure we do enough to
     # be able to do arch: all mapping.
@@ -367,10 +345,7 @@ def do_da_do_da():
     (con_suites, con_architectures, con_components, check_source) = \
                  utils.parse_args(Options)
 
-    if stable_dislocation_p():
-        dislocated_files = symlink_dists.find_dislocated_stable(Cnf, projectB)
-    else:
-        dislocated_files = {}
+    dislocated_files = {}
 
     query = """
 SELECT b.id, b.package, a.arch_string, b.version, l.path, f.filename, c.name,
@@ -416,7 +391,7 @@ def main():
                  ('n', "no-delete", "Make-Suite-File-List::Options::No-Delete"),
                  ('f', "force", "Make-Suite-File-List::Options::Force"),
                  ('s', "suite", "Make-Suite-File-List::Options::Suite", "HasArg")]
-    for i in ["architecture", "component", "help", "no-delete", "suite", "force-touch" ]:
+    for i in ["architecture", "component", "help", "no-delete", "suite", "force" ]:
         if not Cnf.has_key("Make-Suite-File-List::Options::%s" % (i)):
             Cnf["Make-Suite-File-List::Options::%s" % (i)] = ""
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)