From 7ae8ff5952dc012ae2adeac5699ebc0f48b9b9ff Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 19 Sep 2010 17:21:41 +0200 Subject: [PATCH] Get rid of overridesuite and validtime in dak.conf Signed-off-by: Joerg Jaspert --- config/debian/dak.conf | 10 ---------- dak/generate_releases.py | 6 +++--- daklib/queue.py | 33 +++++++++++++++++++-------------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 0d094c93..c798617d 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -205,8 +205,6 @@ Suite contrib; non-free; }; - OverrideSuite "stable"; - ValidTime 604800; // 7 days VersionChecks { MustBeNewerThan @@ -235,7 +233,6 @@ Suite contrib; non-free; }; - ValidTime 604800; // 7 days }; Testing-Proposed-Updates @@ -246,8 +243,6 @@ Suite contrib; non-free; }; - OverrideSuite "testing"; - ValidTime 604800; // 7 days VersionChecks { MustBeNewerThan @@ -277,8 +272,6 @@ Suite contrib; non-free; }; - OverrideSuite "testing"; - ValidTime 604800; // 7 days VersionChecks { MustBeNewerThan @@ -302,7 +295,6 @@ Suite contrib; non-free; }; - ValidTime 604800; // 7 days VersionChecks { MustBeNewerThan @@ -324,8 +316,6 @@ Suite contrib; non-free; }; - OverrideSuite "unstable"; - ValidTime 604800; // 7 days VersionChecks { MustBeNewerThan diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 31cae490..04627fc4 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -227,7 +227,7 @@ def main (): architectures = get_suite_architectures(suite, skipall=True, skipsrc=True) - if SuiteBlock.has_key("NotAutomatic"): + if suiteobj.notautomatic: notautomatic = "yes" else: notautomatic = "" @@ -266,8 +266,8 @@ def main (): out.write("Codename: %s\n" % (codename)) out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time())))) - if SuiteBlock.has_key("ValidTime"): - validtime=float(SuiteBlock["ValidTime"]) + if suiteobj.validtime: + validtime=float(suiteobj.validtime) out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+validtime)))) if notautomatic != "": diff --git a/daklib/queue.py b/daklib/queue.py index e3874b62..305d4838 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -162,18 +162,22 @@ def determine_new(filename, changes, files, warn=1, session = None): # Fix up the list of target suites cnf = Config() for suite in changes["suite"].keys(): - override = cnf.Find("Suite::%s::OverrideSuite" % (suite)) - if override: - (olderr, newerr) = (get_suite(suite, session) == None, - get_suite(override, session) == None) - if olderr or newerr: - (oinv, newinv) = ("", "") - if olderr: oinv = "invalid " - if newerr: ninv = "invalid " - print "warning: overriding %ssuite %s to %ssuite %s" % ( - oinv, suite, ninv, override) - del changes["suite"][suite] - changes["suite"][override] = 1 + oldsuite = get_suite(suite, session) + if not oldsuite: + print "WARNING: Invalid suite %s found" % suite + continue + + if oldsuite.overridesuite: + newsuite = get_suite(oldsuite.overridesuite, session) + + if newsuite: + print "WARNING: overriding suite %s to suite %s" % ( + suite, oldsuite.overridesuite) + del changes["suite"][suite] + changes["suite"][oldsuite.overridesuite] = 1 + else: + print "WARNING: Told to use overridesuite %s for %s but it doesn't exist. Bugger" % ( + oldsuite.overridesuite, suite) # Check for unprocessed byhand files if dbchg is not None: @@ -2361,8 +2365,9 @@ distribution.""" file_type = binary_type # Override suite name; used for example with proposed-updates - if cnf.Find("Suite::%s::OverrideSuite" % (suite)) != "": - suite = cnf["Suite::%s::OverrideSuite" % (suite)] + oldsuite = get_suite(suite, session) + if oldsuite.overridesuite: + suite = oldsuite.overridesuite result = get_override(package, suite, component, file_type, session) -- 2.39.5