From ae75cd9fe86b11c285eb033ac56711061e6975c5 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Tue, 23 Dec 2008 20:36:54 +0100 Subject: [PATCH] Remove old dislocation support Signed-off-by: Joerg Jaspert --- ChangeLog | 6 ++++++ config/debian-security/dak.conf | 1 - config/debian/dak.conf | 1 - dak/make_suite_file_list.py | 26 +------------------------- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index a54a2eb1..9083037f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-12-23 Joerg Jaspert + + * dak/make_suite_file_list.py (stable_dislocation_p): Removed + + * config/debian/dak.conf, config/debian-security/dak.conf: Remove "StableDislocationSupport "false";" + 2008-12-19 Joerg Jaspert * daklib/utils.py: move the html escape stuff here. diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 3281f7e1..ff74a599 100644 --- a/config/debian-security/dak.conf +++ b/config/debian-security/dak.conf @@ -33,7 +33,6 @@ Dinstall DefaultSuite "stable"; SuiteSuffix "updates"; OverrideMaintainer "dak@security.debian.org"; - StableDislocationSupport "false"; LegacyStableHasNoSections "false"; }; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index f69dc635..b82154b3 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -24,7 +24,6 @@ Dinstall BXANotify "true"; CloseBugs "true"; OverrideDisparityCheck "true"; - StableDislocationSupport "false"; DefaultSuite "unstable"; UserExtensions "/srv/ftp.debian.org/dak/config/debian/extensions.py"; QueueBuildSuites diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py index e3664385..697484be 100755 --- a/dak/make_suite_file_list.py +++ b/dak/make_suite_file_list.py @@ -331,27 +331,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 +346,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, -- 2.39.2