Merge branch 'typofix'

[dak.git] / dak / make_overrides.py

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 8b8fd46f61709ed3d078ffe67ae8799b6ac8dc3e..b925d927c294108d3998bb7abcc9703abb307587 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -120,7 +120,7 @@ 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)
@@ -141,7 +141,9 @@ def main ():
                 elif otype_name == "dsc":
                     suffix = ".src"
 
-                filename = os.path.join(cnf["Dir::Override"], "override.%s.%s%s" % (override_suite, component.component_name, suffix))
+                cname = component.component_name.replace('/', '_')
+                filename = os.path.join(cnf["Dir::Override"], "override.%s.%s%s" % (override_suite, cname, suffix))
+
                 output_file = utils.open_file(filename, 'w')
                 do_list(output_file, suite, component, otype, session)
                 output_file.close()