[Treepkg-commits] r92 - in trunk: test treepkg

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-06-20 17:08:59 +0200 (Fri, 20 Jun 2008)
New Revision: 92

Modified:
   trunk/test/test_readconfig.py
   trunk/treepkg/packager.py
   trunk/treepkg/readconfig.py
Log:
Introduce package track config option signing_key_id to specify the
keyid of the openpgp key with which to sign packages


Modified: trunk/test/test_readconfig.py
===================================================================
--- trunk/test/test_readconfig.py	2008-06-20 14:54:27 UTC (rev 91)
+++ trunk/test/test_readconfig.py	2008-06-20 15:08:59 UTC (rev 92)
@@ -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")])

Modified: trunk/treepkg/packager.py
===================================================================
--- trunk/treepkg/packager.py	2008-06-20 14:54:27 UTC (rev 91)
+++ trunk/treepkg/packager.py	2008-06-20 15:08:59 UTC (rev 92)
@@ -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"

Modified: trunk/treepkg/readconfig.py
===================================================================
--- trunk/treepkg/readconfig.py	2008-06-20 14:54:27 UTC (rev 91)
+++ trunk/treepkg/readconfig.py	2008-06-20 15:08:59 UTC (rev 92)
@@ -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 = [