X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_overrides.py;h=1d8f9c02ca7fc7a6b3fcf6636f0d72e4cffa2b94;hb=dd06e01b323a8d5bd6130d80cb418647c856fa5a;hp=8b8fd46f61709ed3d078ffe67ae8799b6ac8dc3e;hpb=0872b2e0b78670c91fd2bf0bda52e5761e079820;p=dak.git

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 8b8fd46f..1d8f9c02 100755
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -112,36 +112,34 @@ def main ():
     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 = cnf["Suite::%s::OverrideCodeName" % (suite_name)]
+        override_suite = suite.overridecodename
 
-        for component_name in cnf.SubTree("Component").List():
-            component = get_component(component_name, session)
-            if not component:
-                utils.fubar('Component %s not found' % component_name)
-
-            for otype_name in cnf.ValueList("OverrideType"):
-                otype = get_override_type(otype_name, session)
-                if not otype:
-                    utils.fubar('OverrideType %s not found' % otype_name)
+        for component in session.query(Component).all():
+            for otype in session.query(OverrideType).all():
+                otype_name = otype.overridetype
+                cname = component.component_name
 
+                # TODO: Stick suffix info in database (or get rid of it)
                 if otype_name == "deb":
                     suffix = ""
                 elif otype_name == "udeb":
-                    if component == "contrib":
+                    if cname == "contrib":
                         continue # Ick2
                     suffix = ".debian-installer"
                 elif otype_name == "dsc":
                     suffix = ".src"
+                else:
+                    utils.fubar("Don't understand OverrideType %s" % otype.overridetype)
+
+                cname = cname.replace('/', '_')
+                filename = os.path.join(cnf["Dir::Override"], "override.%s.%s%s" % (override_suite, cname, suffix))
 
-                filename = os.path.join(cnf["Dir::Override"], "override.%s.%s%s" % (override_suite, component.component_name, suffix))
                 output_file = utils.open_file(filename, 'w')
                 do_list(output_file, suite, component, otype, session)
                 output_file.close()