From 2f6b3684421814c4b1a67c3ded48d956fc1f118c Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Thu, 21 Apr 2016 16:22:12 +0300 Subject: Make each project define its package signing key --- icklib/project.py | 4 ++++ icklib/step_debian_publish.py | 8 +++++--- 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) -- cgit v1.2.1