Launchpad itself

Merge lp:~cjwatson/launchpad/ppa-generate-keys-logging into lp:launchpad

  1. ppa-generate-keys-logging
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18909
Proposed branch: lp:~cjwatson/launchpad/ppa-generate-keys-logging
Merge into: lp:launchpad
Diff against target: 50 lines (+9/-6)
2 files modified
lib/lp/soyuz/scripts/ppakeygenerator.py (+6/-4)
lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py (+3/-2)
To merge this branch: bzr merge lp:~cjwatson/launchpad/ppa-generate-keys-logging
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+364439@code.launchpad.net

Commit message

Log archive references in PPAKeyGenerator.

Description of the change

This just makes logs a bit easier to grep.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/soyuz/scripts/ppakeygenerator.py'
--- lib/lp/soyuz/scripts/ppakeygenerator.py 2018-12-04 15:02:56 +0000
+++ lib/lp/soyuz/scripts/ppakeygenerator.py 2019-03-14 12:50:23 +0000
@@ -1,4 +1,4 @@
1# Copyright 2009-2015 Canonical Ltd. This software is licensed under the1# Copyright 2009-2019 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
33
4__all__ = [4__all__ = [
@@ -30,7 +30,8 @@
30 def generateKey(self, archive):30 def generateKey(self, archive):
31 """Generate a signing key for the given archive."""31 """Generate a signing key for the given archive."""
32 self.logger.info(32 self.logger.info(
33 "Generating signing key for %s" % archive.displayname)33 "Generating signing key for %s (%s)" %
34 (archive.reference, archive.displayname))
34 archive_signing_key = IArchiveSigningKey(archive)35 archive_signing_key = IArchiveSigningKey(archive)
35 archive_signing_key.generateSigningKey()36 archive_signing_key.generateSigningKey()
36 self.logger.info("Key %s" % archive.signing_key.fingerprint)37 self.logger.info("Key %s" % archive.signing_key.fingerprint)
@@ -46,8 +47,9 @@
46 % self.options.archive)47 % self.options.archive)
47 if archive.signing_key is not None:48 if archive.signing_key is not None:
48 raise LaunchpadScriptFailure(49 raise LaunchpadScriptFailure(
49 "%s already has a signing_key (%s)"50 "%s (%s) already has a signing_key (%s)"
50 % (archive.displayname, archive.signing_key.fingerprint))51 % (archive.reference, archive.displayname,
52 archive.signing_key.fingerprint))
51 archives = [archive]53 archives = [archive]
52 else:54 else:
53 archive_set = getUtility(IArchiveSet)55 archive_set = getUtility(IArchiveSet)
5456
=== modified file 'lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py'
--- lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py 2018-01-02 16:10:26 +0000
+++ lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py 2019-03-14 12:50:23 +0000
@@ -1,4 +1,4 @@
1# Copyright 2009-2015 Canonical Ltd. This software is licensed under the1# Copyright 2009-2019 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
33
4"""`PPAKeyGenerator` script class tests."""4"""`PPAKeyGenerator` script class tests."""
@@ -81,7 +81,8 @@
81 archive_reference='~cprov/ubuntu/ppa')81 archive_reference='~cprov/ubuntu/ppa')
82 self.assertRaisesWithContent(82 self.assertRaisesWithContent(
83 LaunchpadScriptFailure,83 LaunchpadScriptFailure,
84 ("PPA for Celso Providelo already has a signing_key (%s)" %84 ("~cprov/ubuntu/ppa (PPA for Celso Providelo) already has a "
85 "signing_key (%s)" %
85 cprov.archive.signing_key.fingerprint),86 cprov.archive.signing_key.fingerprint),
86 key_generator.main)87 key_generator.main)
8788