From d092db5a64fc5ee4143493a7f2bbb327077e08a3 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Fri, 2 Sep 2011 21:34:04 +0100 Subject: [PATCH] Move sanity check to use database Signed-off-by: Mark Hymers --- dak/control_suite.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dak/control_suite.py b/dak/control_suite.py index 57e43da6..3ba5acdc 100755 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -421,15 +421,17 @@ def main (): utils.fubar("Can only perform one action at a time.") action = i + # Safety/Sanity check + if action == "set" and (not suite.allowcsset): + if force: + utils.warn("Would not normally allow setting suite %s (allowsetcs is FALSE), but --force used" % (suite_name)) + else: + utils.fubar("Will not reset suite %s due to its database configuration (allowsetcs is FALSE)" % (suite_name)) + # Need an action... if action == None: utils.fubar("No action specified.") - # Safety/Sanity check - # XXX: This should be stored in the database - if action == "set" and suite_name not in ["testing", "squeeze-updates"]: - utils.fubar("Will not reset suite %s" % (suite_name)) - britney = False if action == "set" and cnf["Control-Suite::Options::Britney"]: britney = True -- 2.39.5