X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=39a76203967de8fbab9bd379e7a130cdab2ea685;hb=ba177e7cd24880b6925108c805ed178fd20b6ca9;hp=8a371e8a8d3dd5a3ff925d4009950614afbea03d;hpb=f0c9c4a9593f7cde0e969e658d68b0a10b866025;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 8a371e8a..39a76203 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -101,7 +101,7 @@ def sign_release_dir(suite, dirname): # We can only use one key for inline signing so use the first one in # the array for consistency - firstkey = False + firstkey = True for keyid in suite.signingkeys: defkeyid = "--default-key %s" % keyid @@ -154,11 +154,15 @@ 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") - out = open(outfile, "w") + out = open(outfile + ".new", "w") for key, dbfield in attribs: if getattr(suite, dbfield) is not None: - out.write("%s: %s\n" % (key, getattr(suite, dbfield))) + # TEMPORARY HACK HACK HACK until we change the way we store the suite names etc + if key == 'Suite' and getattr(suite, dbfield) == 'squeeze-updates': + out.write("Suite: stable-updates\n") + else: + out.write("%s: %s\n" % (key, getattr(suite, dbfield))) out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time())))) @@ -280,6 +284,7 @@ class ReleaseWriter(object): out.write(" %s %8d %s\n" % (fileinfo[filename][h], fileinfo[filename]['len'], filename)) out.close() + os.rename(outfile + '.new', outfile) sign_release_dir(suite, os.path.dirname(outfile))