From: Torsten Werner <twerner@debian.org>
Date: Thu, 24 Mar 2011 18:57:09 +0000 (+0100)
Subject: Merge branch 'master' of ftp-master.debian.org:/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fdd9528a381f1472a93f52877e75858e6ed8570b;hp=4bd036e1e2c3663991a9685a8d09ed58f293c140;p=dak.git

Merge branch 'master' of ftp-master.debian.org:/srv/ftp.debian.org/git/dak
---

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']