From: Mark Hymers Date: Thu, 24 Mar 2011 18:54:12 +0000 (+0000) Subject: Fix up output path for security X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f59136349f10c1ad8b29ab2bf00c8101879b8e8;p=dak Fix up output path for security Signed-off-by: Mark Hymers --- diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 17b68d3d..34472425 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -149,7 +149,9 @@ class ReleaseWriter(object): cnf = Config() - outfile = os.path.join(cnf["Dir::Root"], 'dists', suite.suite_name, "Release") + suite_suffix = "%s" % (cnf.Find("Dinstall::SuiteSuffix")) + + outfile = os.path.join(cnf["Dir::Root"], 'dists', "%s%s" % (suite.suite_name, suite_suffix), "Release") out = open(outfile, "w") for key, dbfield in attribs: @@ -168,8 +170,6 @@ class ReleaseWriter(object): out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures]))) - suite_suffix = "%s" % (cnf.Find("Dinstall::SuiteSuffix")) - ## FIXME: Components need to be adjusted to whatever will be in the db ## Needs putting in the DB components = ['main', 'contrib', 'non-free']