From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 19 Sep 2010 10:36:28 +0000 (+0200)
Subject: Remove codename from dak.conf
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ee794150c7fb0a800081c7c6f8cd2c005f15b3d7;p=dak.git

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 5169e8bf..a9fb9775 100644
--- 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 3d4ff8b5..3581f760 100644
--- 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 2987f9be..bca0c662 100755
--- 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