Remove codename from dak.conf

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

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 5169e8bf36899c2a6806c6fdae1e3608859c9f84..a9fb9775327413432468daa1ac4473cd8f4eb730 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -189,7 +189,6 @@ Suite
          non-free;
        };
 
-       CodeName "lenny-backports";
        OverrideCodeName "lenny-backports";
        Priority "7";
        NotAutomatic "yes";
@@ -205,7 +204,6 @@ Suite
          non-free;
        };
 
-       CodeName "squeeze-backports";
        OverrideCodeName "squeeze-backports";
        Priority "7";
        NotAutomatic "yes";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3d4ff8b595ab81f138096f2318e1d5c6af15050c..3581f76046eeea374c224b4bbd5ce1a4689d4a11 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -195,7 +195,6 @@ Suite
          contrib;
          non-free;
        };
-       CodeName "lenny";
        OverrideCodeName "lenny";
        Priority "5";
        ChangeLogBase "dists/stable/";
@@ -212,7 +211,6 @@ Suite
        CopyChanges "dists/proposed-updates/";
        CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
        CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
-       CodeName "lenny-proposed-updates";
        OverrideCodeName "lenny";
        OverrideSuite "stable";
        ValidTime 604800; // 7 days
@@ -245,7 +243,6 @@ Suite
          contrib;
          non-free;
        };
-       CodeName "squeeze";
        OverrideCodeName "squeeze";
        ValidTime 604800; // 7 days
        Priority "5";
@@ -259,7 +256,6 @@ Suite
          contrib;
          non-free;
        };
-       CodeName "squeeze-proposed-updates";
        OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
@@ -293,7 +289,6 @@ Suite
          contrib;
          non-free;
        };
-       CodeName "squeeze-volatile";
        OverrideCodeName "squeeze";
        OverrideSuite "testing";
        ValidTime 604800; // 7 days
@@ -322,7 +317,6 @@ Suite
          contrib;
          non-free;
        };
-       CodeName "sid";
        OverrideCodeName "sid";
        ValidTime 604800; // 7 days
        Priority "7";
@@ -347,7 +341,6 @@ Suite
          contrib;
          non-free;
        };
-       CodeName "experimental";
        NotAutomatic "yes";
        OverrideCodeName "sid";
        OverrideSuite "unstable";

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index 2987f9be10978ff58a2abc22f287a92d8bfb47e7..bca0c66223cfa55c2806ffd5af10112802f0dfdf 100755 (executable)
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -353,19 +353,13 @@ def main ():
             pass
 
         print "Processing %s%s..." % (osuite, originremark)
+        suiteobj = get_suite(osuite)
         # Get a list of all suites that use the override file of 'osuite'
-        ocodename = cnf["Suite::%s::codename" % osuite].lower()
-        suites = []
-        suiteids = []
-        for suite in cnf.SubTree("Suite").List():
-            if ocodename == cnf["Suite::%s::OverrideCodeName" % suite].lower():
-                suites.append(suite)
-                s = get_suite(suite.lower(), session)
-                if s is not None:
-                    suiteids.append(s.suite_id)
-
-        if len(suiteids) != len(suites) or len(suiteids) < 1:
-            utils.fubar("Couldn't find id's of all suites: %s" % suites)
+        ocodename = suiteobj.codename
+        suiteids = [x.suite_id for x in session.query(Suite).filter(Suite.overridecodename == ocodename).all()]
+
+        if len(suiteids) < 1:
+            utils.fubar("Couldn't find id's of all suites: %s" % suiteids)
 
         for component in cnf.SubTree("Component").List():
             # It is crucial for the dsc override creation based on binary