From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 23 Dec 2008 19:55:06 +0000 (+0100)
Subject: Merge commit 'ncomm/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ed206014f2fe753830abac1c0c0772f0c9c9dc29;hp=d95b0a148ea38f20e44c1833bb21901f856c4f04;p=dak.git

Merge commit 'ncomm/master' into merge

* commit 'ncomm/master':
  Removed symlink_dist from dak.py (however, make_suite_file_list still depends

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/ChangeLog b/ChangeLog
index a54a2eb1..9083037f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-23  Joerg Jaspert  <joerg@debian.org>
+
+	* 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  <joerg@debian.org>
 
 	* 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..41e6cb33 100755
--- 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,