Merge remote-tracking branch 'nthykier/auto-decruft'

[dak.git] / dak / make_overrides.py

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 716b085bdf488f975c541113c70013235b0a67b4..569ee7696d831f4312ddad7e9e012b57a5232587 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -104,23 +104,21 @@ def main ():
     for i in [ "help" ]:
         if not cnf.has_key("Make-Overrides::Options::%s" % (i)):
             cnf["Make-Overrides::Options::%s" % (i)] = ""
-    apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
-    Options = cnf.SubTree("Make-Overrides::Options")
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.subtree("Make-Overrides::Options")
     if Options["Help"]:
         usage()
 
     d = DBConn()
     session = d.session()
 
-    for suite_name in cnf.SubTree("Check-Overrides::OverrideSuites").List():
-        suite = get_suite(suite_name.lower(), session)
-        if not suite:
-            utils.fubar('Suite %s not found' % suite_name)
+    for suite in session.query(Suite).filter(Suite.overrideprocess==True):
         if suite.untouchable:
+            print "Skipping %s as it is marked as untouchable" % suite.suite_name
             continue
 
         sys.stderr.write("Processing %s...\n" % (suite.suite_name))
-        override_suite = suite.overridecodename
+        override_suite = suite.overridecodename or suite.codename
 
         for component in session.query(Component).all():
             for otype in session.query(OverrideType).all():