Merge lp:~cjwatson/launchpad/assorted-typos into lp:launchpad

Proposed by Colin Watson on 2018-12-04
Status: Merged
Merged at revision: 18835
Proposed branch: lp:~cjwatson/launchpad/assorted-typos
Merge into: lp:launchpad
Diff against target: 78 lines (+7/-6)
6 files modified
lib/lp/app/utilities/celebrities.py (+1/-1)
lib/lp/archivepublisher/customupload.py (+1/-1)
lib/lp/archiveuploader/nascentupload.py (+1/-1)
lib/lp/code/interfaces/hasgitrepositories.py (+2/-1)
lib/lp/registry/services/sharingservice.py (+1/-1)
lib/lp/soyuz/scripts/ppakeygenerator.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/assorted-typos
Reviewer Review Type Date Requested Status
William Grant code 2018-12-04 Approve on 2018-12-05
Review via email: mp+360066@code.launchpad.net

Commit message

Fix an assortment of minor typos.

To post a comment you must log in.
William Grant (wgrant) wrote :

But how

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/app/utilities/celebrities.py'
2--- lib/lp/app/utilities/celebrities.py 2016-04-11 08:31:24 +0000
3+++ lib/lp/app/utilities/celebrities.py 2018-12-04 15:06:53 +0000
4@@ -22,7 +22,7 @@
5 class MutatedCelebrityError(Exception):
6 """A celebrity has had its id or name changed in the database.
7
8- This would indicate a major prodution screwup.
9+ This would indicate a major production screwup.
10 """
11
12
13
14=== modified file 'lib/lp/archivepublisher/customupload.py'
15--- lib/lp/archivepublisher/customupload.py 2018-05-06 08:52:34 +0000
16+++ lib/lp/archivepublisher/customupload.py 2018-12-04 15:06:53 +0000
17@@ -89,7 +89,7 @@
18 """A build for this type, architecture, and version already exists."""
19 def __init__(self, custom_type, arch, version):
20 message = ('%s build %s for architecture %s already exists' %
21- (custom_type, arch, version))
22+ (custom_type, version, arch))
23 CustomUploadError.__init__(self, message)
24
25
26
27=== modified file 'lib/lp/archiveuploader/nascentupload.py'
28--- lib/lp/archiveuploader/nascentupload.py 2017-09-17 10:35:57 +0000
29+++ lib/lp/archiveuploader/nascentupload.py 2018-12-04 15:06:53 +0000
30@@ -343,7 +343,7 @@
31 # by one.
32 max += 1
33 if len(considered_archs) > max:
34- self.reject("Upload has more architetures than it is supported.")
35+ self.reject("Upload has more architectures than is supported.")
36
37 def _matchDDEBs(self):
38 """Check and link DEBs and DDEBs in the upload.
39
40=== modified file 'lib/lp/code/interfaces/hasgitrepositories.py'
41--- lib/lp/code/interfaces/hasgitrepositories.py 2015-03-05 16:23:26 +0000
42+++ lib/lp/code/interfaces/hasgitrepositories.py 2018-12-04 15:06:53 +0000
43@@ -17,7 +17,8 @@
44 """An object that has related Git repositories.
45
46 A project contains Git repositories, a source package on a distribution
47- contains branches, and a person contains "personal" branches.
48+ contains Git repositories, and a person contains "personal" Git
49+ repositories.
50 """
51
52 export_as_webservice_entry(
53
54=== modified file 'lib/lp/registry/services/sharingservice.py'
55--- lib/lp/registry/services/sharingservice.py 2015-10-01 10:25:19 +0000
56+++ lib/lp/registry/services/sharingservice.py 2018-12-04 15:06:53 +0000
57@@ -87,7 +87,7 @@
58 """Service providing operations for adding and removing pillar grantees.
59
60 Service is accessed via a url of the form
61- '/services/sharing?ws.op=...
62+ '/+services/sharing?ws.op=...
63 """
64
65 @property
66
67=== modified file 'lib/lp/soyuz/scripts/ppakeygenerator.py'
68--- lib/lp/soyuz/scripts/ppakeygenerator.py 2015-09-26 02:02:11 +0000
69+++ lib/lp/soyuz/scripts/ppakeygenerator.py 2018-12-04 15:06:53 +0000
70@@ -19,7 +19,7 @@
71
72 class PPAKeyGenerator(LaunchpadCronScript):
73
74- usage = '%prog [-p PPA owner]'
75+ usage = '%prog [-A archive-reference]'
76 description = 'Generate a GPG signing key for PPAs.'
77
78 def add_my_options(self):