X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=e67bd91f6d2b3e0ed0078dc93d72d1e0c51002a9;hb=7fea37eacaa6cde844f70c0bc2da92b647e87165;hp=37b4290e19f3ea2ecb145dce20fe35738fb8f6fd;hpb=c2310c93d6bd48e7b9b55b4d3a6e971c8297a044;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 37b4290e..e67bd91f 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -149,8 +149,9 @@ class ReleaseWriter(object): cnf = Config() - outfile = os.path.join(cnf["Dir::Root"], 'dists', suite.suite_name, "Release") - print outfile + 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: @@ -169,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'] @@ -205,7 +204,7 @@ class ReleaseWriter(object): # their checksums to the main Release file oldcwd = os.getcwd() - os.chdir("%sdists/%s" % (cnf["Dir::Root"], suite.suite_name)) + os.chdir("%sdists/%s/%s" % (cnf["Dir::Root"], suite.suite_name, suite_suffix)) hashfuncs = { 'MD5Sum' : apt_pkg.md5sum, 'SHA1' : apt_pkg.sha1sum,