From 7fea37eacaa6cde844f70c0bc2da92b647e87165 Mon Sep 17 00:00:00 2001 From: Mark Hymers Date: Thu, 24 Mar 2011 19:03:40 +0000 Subject: [PATCH] More fixes for stupid suitesuffix stuff Signed-off-by: Mark Hymers --- config/debian-security/dak.conf | 2 +- dak/generate_releases.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf index 35eadcb7..cdfe9ea6 100644 --- 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 8ae74441..e67bd91f 100755 --- 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, -- 2.39.2