summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-04-21 16:22:12 +0300
committerLars Wirzenius <liw@liw.fi>2016-04-21 16:22:12 +0300
commit2f6b3684421814c4b1a67c3ded48d956fc1f118c (patch)
treeb54741040f2c6422b2171d1bc7c2013d20a5a1a3
parentef2a2b124cc7205dbe4dd9df236cd480eee61983 (diff)
downloadick-2f6b3684421814c4b1a67c3ded48d956fc1f118c.tar.gz
Make each project define its package signing key
-rw-r--r--icklib/project.py4
-rw-r--r--icklib/step_debian_publish.py8
2 files changed, 9 insertions, 3 deletions
diff --git a/icklib/project.py b/icklib/project.py
index 32f489b..698bc14 100644
--- a/icklib/project.py
+++ b/icklib/project.py
@@ -33,6 +33,7 @@ class Project(object):
self.progress = None
self.git_specs = []
self.repo_signing_key = None
+ self.package_signing_key = None
self.commands = []
self.local_commands = []
self.env = {}
@@ -50,6 +51,9 @@ class Project(object):
def set_repo_signing_key(self, key_id):
self.repo_signing_key = key_id
+ def set_package_signing_key(self, key_id):
+ self.package_signing_key = key_id
+
def add_shell_command(self, command):
self.commands.append(command)
diff --git a/icklib/step_debian_publish.py b/icklib/step_debian_publish.py
index b761f77..94d4934 100644
--- a/icklib/step_debian_publish.py
+++ b/icklib/step_debian_publish.py
@@ -69,9 +69,11 @@ class PublishDebianPackages(icklib.BuildStep):
return glob.glob(os.path.join(tempdir, '*.changes'))
def _debsign(self, tempdir):
- files = self._changes_files(tempdir)
- self.project.run_locally(
- ['debsign'] + files, 'debsign *.changes', tempdir)
+ argv = ['debsign']
+ if self.project.package_signing_key is not None:
+ argv += ['-k', self.project.package_signing_key]
+ argv += self._changes_files(tempdir)
+ self.project.run_locally(argv, 'debsign *.changes', tempdir)
def _dput_targets(self, tempdir):
files = self._changes_files(tempdir)