Merge branch 'master' into bugfixes

[dak.git] / dak / make_overrides.py

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index bff25dd96d539bc4287e26f3607d3b5c0ce630dd..7ac3ec275fa6a1e04ba471bbc68927e72e6cab88 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -118,15 +118,13 @@ def main ():
     database.init(Cnf, projectB)
 
     for suite in Cnf.SubTree("Check-Overrides::OverrideSuites").List():
-        if Cnf.has_key("Suite::%s::Untouchable" % suite) and Cnf["Suite::%s::Untouchable" % suite] != 0:
+        if database.get_suite_untouchable(suite):
             continue
         suite = suite.lower()
 
         sys.stderr.write("Processing %s...\n" % (suite))
         override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)]
         for component in Cnf.SubTree("Component").List():
-            if component == "mixed":
-                continue # Ick
             for otype in Cnf.ValueList("OverrideType"):
                 if otype == "deb":
                     suffix = ""