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
1=== modified file 'lib/lp/soyuz/scripts/ppakeygenerator.py'
2--- lib/lp/soyuz/scripts/ppakeygenerator.py 2018-12-04 15:02:56 +0000
3+++ lib/lp/soyuz/scripts/ppakeygenerator.py 2019-03-14 12:50:23 +0000
4@@ -1,4 +1,4 @@
5-# Copyright 2009-2015 Canonical Ltd. This software is licensed under the
6+# Copyright 2009-2019 Canonical Ltd. This software is licensed under the
7 # GNU Affero General Public License version 3 (see the file LICENSE).
8
9 __all__ = [
10@@ -30,7 +30,8 @@
11 def generateKey(self, archive):
12 """Generate a signing key for the given archive."""
13 self.logger.info(
14- "Generating signing key for %s" % archive.displayname)
15+ "Generating signing key for %s (%s)" %
16+ (archive.reference, archive.displayname))
17 archive_signing_key = IArchiveSigningKey(archive)
18 archive_signing_key.generateSigningKey()
19 self.logger.info("Key %s" % archive.signing_key.fingerprint)
20@@ -46,8 +47,9 @@
21 % self.options.archive)
22 if archive.signing_key is not None:
23 raise LaunchpadScriptFailure(
24- "%s already has a signing_key (%s)"
25- % (archive.displayname, archive.signing_key.fingerprint))
26+ "%s (%s) already has a signing_key (%s)"
27+ % (archive.reference, archive.displayname,
28+ archive.signing_key.fingerprint))
29 archives = [archive]
30 else:
31 archive_set = getUtility(IArchiveSet)
32
33=== modified file 'lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py'
34--- lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py 2018-01-02 16:10:26 +0000
35+++ lib/lp/soyuz/scripts/tests/test_ppakeygenerator.py 2019-03-14 12:50:23 +0000
36@@ -1,4 +1,4 @@
37-# Copyright 2009-2015 Canonical Ltd. This software is licensed under the
38+# Copyright 2009-2019 Canonical Ltd. This software is licensed under the
39 # GNU Affero General Public License version 3 (see the file LICENSE).
40
41 """`PPAKeyGenerator` script class tests."""
42@@ -81,7 +81,8 @@
43 archive_reference='~cprov/ubuntu/ppa')
44 self.assertRaisesWithContent(
45 LaunchpadScriptFailure,
46- ("PPA for Celso Providelo already has a signing_key (%s)" %
47+ ("~cprov/ubuntu/ppa (PPA for Celso Providelo) already has a "
48+ "signing_key (%s)" %
49 cprov.archive.signing_key.fingerprint),
50 key_generator.main)
51