# HG changeset patch # User Bernhard Herzog # Date 1213974539 0 # Node ID 36004ee0b3a193843867701ae6c86c3253fcf3c5 # Parent 61fd2892b80bb2c63433755aa349f74868e9da68 Introduce package track config option signing_key_id to specify the keyid of the openpgp key with which to sign packages diff -r 61fd2892b80b -r 36004ee0b3a1 test/test_readconfig.py --- a/test/test_readconfig.py Fri Jun 20 14:54:27 2008 +0000 +++ b/test/test_readconfig.py Fri Jun 20 15:08:59 2008 +0000 @@ -40,6 +40,7 @@ base_dir: %(tracks_dir)s/%(name)s packager_class: readconfig_test.%(name)s handle_dependencies: True +signing_key_id: abcd1234 [pkg_extraargs] svn_url: svn://example.com/%(name)s/trunk @@ -87,6 +88,7 @@ packager_class="readconfig_test.extraargs", pbuilderrc="/home/builder/mill/pbuilder/pbuilderrc", root_cmd=['sudo'], + signing_key_id="", svn_url="svn://example.com/extraargs/trunk", orig_tarball=("/home/builder/mill/" "tracks/extraargs/mytarball.tgz")), @@ -99,4 +101,5 @@ packager_class="readconfig_test.simple", pbuilderrc="/home/builder/mill/pbuilder/pbuilderrc", root_cmd=['sudo'], + signing_key_id="abcd1234", svn_url="svn://example.com/simple/trunk")]) diff -r 61fd2892b80b -r 36004ee0b3a1 treepkg/packager.py --- a/treepkg/packager.py Fri Jun 20 14:54:27 2008 +0000 +++ b/treepkg/packager.py Fri Jun 20 15:08:59 2008 +0000 @@ -305,7 +305,8 @@ def __init__(self, name, base_dir, svn_url, root_cmd, pbuilderrc, deb_email, deb_fullname, packager_class="treepkg.packager", - debrevision_prefix="treepkg", handle_dependencies=False): + debrevision_prefix="treepkg", handle_dependencies=False, + signing_key_id=""): self.name = name self.base_dir = base_dir self.svn_url = svn_url @@ -313,6 +314,7 @@ self.deb_email = deb_email self.deb_fullname = deb_fullname self.debrevision_prefix = debrevision_prefix + self.signing_key_id = signing_key_id self.handle_dependencies = handle_dependencies self.dependencies = None self.pkg_dir_template = "%(revision)d-%(increment)d" diff -r 61fd2892b80b -r 36004ee0b3a1 treepkg/readconfig.py --- a/treepkg/readconfig.py Fri Jun 20 14:54:27 2008 +0000 +++ b/treepkg/readconfig.py Fri Jun 20 15:08:59 2008 +0000 @@ -22,13 +22,15 @@ return False raise ValueError("cannot determine boolean value of %r" % (s,)) -defaults = dict(root_cmd="sudo") +defaults = dict(root_cmd="sudo", + signing_key_id="") packager_desc = [ "name", "base_dir", "svn_url", "packager_class", ("root_cmd", shlex.split), "pbuilderrc", "deb_email", "deb_fullname", "debrevision_prefix", ("handle_dependencies", convert_bool), + "signing_key_id", ] treepkg_desc = [