if arg:
results.append(arg)
-def sign_release_dir(dirname):
+def sign_release_dir(suite, dirname):
cnf = Config()
if cnf.has_key("Dinstall::SigningKeyring"):
keyring += " --keyring \"%s\"" % cnf["Dinstall::SigningPubKeyring"]
arguments = "--no-options --batch --no-tty --armour"
- signkeyids = cnf.signingkeyids.split()
relname = os.path.join(dirname, 'Release')
if os.path.exists(inlinedest):
os.unlink(inlinedest)
- for keyid in signkeyids:
- if keyid != "":
- defkeyid = "--default-key %s" % keyid
- else:
- defkeyid = ""
+ # We can only use one key for inline signing so use the first one in
+ # the array for consistency
+ firstkey = True
+
+ for keyid in suite.signingkeys:
+ defkeyid = "--default-key %s" % keyid
os.system("gpg %s %s %s --detach-sign <%s >>%s" %
(keyring, defkeyid, arguments, relname, dest))
- os.system("gpg %s %s %s --clearsign <%s >>%s" %
- (keyring, defkeyid, arguments, relname, inlinedest))
+ if firstkey:
+ os.system("gpg %s %s %s --clearsign <%s >>%s" %
+ (keyring, defkeyid, arguments, relname, inlinedest))
+ firstkey = False
class ReleaseWriter(object):
def __init__(self, suite):
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 %8d %s\n" % (fileinfo[filename][h], fileinfo[filename]['len'], filename))
out.close()
+ os.rename(outfile + '.new', outfile)
- sign_release_dir(os.path.dirname(outfile))
+ sign_release_dir(suite, os.path.dirname(outfile))
os.chdir(oldcwd)