More fixes for stupid suitesuffix stuff

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 35eadcb7903c27f96a623743b592e371cf34a0a5..cdfe9ea648be6ed61d01406c25164cec746cc8e7 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -31,7 +31,7 @@ Dinstall
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
    DefaultSuite "stable";
-   SuiteSuffix "/updates/";
+   SuiteSuffix "updates/";
    OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
 };

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 8ae74441fd41c2539e4c68ab29f8b2ff347ac6aa..e67bd91f6d2b3e0ed0078dc93d72d1e0c51002a9 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -151,7 +151,7 @@ class ReleaseWriter(object):
 
         suite_suffix = "%s" % (cnf.Find("Dinstall::SuiteSuffix"))
 
-        outfile = os.path.join(cnf["Dir::Root"], 'dists', "%s%s" % (suite.suite_name, suite_suffix), "Release")
+        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:
@@ -204,7 +204,7 @@ class ReleaseWriter(object):
         # their checksums to the main Release file
         oldcwd = os.getcwd()
 
-        os.chdir("%sdists/%s%s" % (cnf["Dir::Root"], suite.suite_name, suite_suffix))
+        os.chdir("%sdists/%s/%s" % (cnf["Dir::Root"], suite.suite_name, suite_suffix))
 
         hashfuncs = { 'MD5Sum' : apt_pkg.md5sum,
                       'SHA1' : apt_pkg.sha1sum,