Kill unused OverrideType from the config file

[dak.git] / dak / make_overrides.py

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 8b8fd46f61709ed3d078ffe67ae8799b6ac8dc3e..716b085bdf488f975c541113c70013235b0a67b4 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -120,28 +120,28 @@ def main ():
             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()