]> git.decadent.org.uk Git - dak.git/commitdiff
Move sanity check to use database
authorMark Hymers <mhy@debian.org>
Fri, 2 Sep 2011 20:34:04 +0000 (21:34 +0100)
committerMark Hymers <mhy@debian.org>
Fri, 2 Sep 2011 20:34:04 +0000 (21:34 +0100)
Signed-off-by: Mark Hymers <mhy@debian.org>
dak/control_suite.py

index 57e43da6ac0b77418c8b4745d4c900ef9c4c8728..3ba5acdced15ae8f5bc731f00ce754d86238d15e 100755 (executable)
@@ -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