From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 12 Dec 2010 14:14:58 +0000 (+0100)
Subject: Merge branch 'master' into security
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=3f481a09790f85764aca7aaf37fb21e1109ba043;hp=e92324954c7e2d4e9a29e5eafc93f55d945665e0;p=dak.git

Merge branch 'master' into security

* master:
  In case the component name contains a /, replace it with a _. Works much better when using this as part of a filename
---

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 02c7f7c2..b925d927 100755
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -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()