Merge ~jugmac00/launchpad:fix-typos into launchpad:master

Proposed by Jürgen Gmach
Status: Merged
Approved by: Jürgen Gmach
Approved revision: eb2972db4092152279c3ddcc197c74ba548e9648
Merged at revision: 20edb29a6a57bfb3ab3b470a0c845cd24b4700d6
Proposed branch: ~jugmac00/launchpad:fix-typos
Merge into: launchpad:master
Diff against target: 131 lines (+11/-11)
8 files modified
lib/lp/archiveuploader/uploadprocessor.py (+2/-2)
lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py (+1/-1)
lib/lp/buildmaster/doc/buildqueue.txt (+1/-1)
lib/lp/buildmaster/interfaces/packagebuild.py (+1/-1)
lib/lp/codehosting/puller/scheduler.py (+1/-1)
lib/lp/codehosting/puller/tests/test_acceptance.py (+1/-1)
lib/lp/registry/javascript/tests/test_structural_subscription.js (+3/-3)
lib/lp/services/twistedsupport/processmonitor.py (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+410788@code.launchpad.net

Commit message

fix typos

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/archiveuploader/uploadprocessor.py b/lib/lp/archiveuploader/uploadprocessor.py
2index 1f22f50..2081a51 100644
3--- a/lib/lp/archiveuploader/uploadprocessor.py
4+++ b/lib/lp/archiveuploader/uploadprocessor.py
5@@ -299,7 +299,7 @@ class UploadHandler:
6 archive) = parse_upload_path(relative_path)
7 except UploadPathError as e:
8 # pick some defaults to create the NascentUpload() object.
9- # We will be rejecting the upload so it doesn matter much.
10+ # We will be rejecting the upload so it doesn't matter much.
11 distribution = getUtility(IDistributionSet)['ubuntu']
12 suite_name = None
13 archive = distribution.main_archive
14@@ -436,7 +436,7 @@ class UploadHandler:
15 return result
16
17 def removeUpload(self, logger):
18- """Remove an upload that has succesfully been processed.
19+ """Remove an upload that has successfully been processed.
20
21 :param logger: The logger to use for logging results.
22 """
23diff --git a/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py b/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py
24index 33bea04..7cf69c3 100644
25--- a/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py
26+++ b/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py
27@@ -52,7 +52,7 @@ class TestBugWatchScheduler(TestCaseWithFactory):
28 # If a watch has been checked and has never failed its next
29 # check will be scheduled for 24 hours after its last check.
30 now = datetime.now(utc)
31- # Add some succesful activity to ensure that successful activity
32+ # Add some successful activity to ensure that successful activity
33 # is handled correctly.
34 self.bug_watch.addActivity()
35 self.bug_watch.lastchecked = now
36diff --git a/lib/lp/buildmaster/doc/buildqueue.txt b/lib/lp/buildmaster/doc/buildqueue.txt
37index 6370c40..92a0650 100644
38--- a/lib/lp/buildmaster/doc/buildqueue.txt
39+++ b/lib/lp/buildmaster/doc/buildqueue.txt
40@@ -10,7 +10,7 @@ initialization.
41 BuildQueue should provide all the information needed for dispatching
42 and collecting build results.
43
44-As soon as a build job is processed succesfully (dispatched &
45+As soon as a build job is processed successfully (dispatched &
46 collected) the BuildQueue record representing it is removed.
47
48 >>> from lp.testing import verifyObject
49diff --git a/lib/lp/buildmaster/interfaces/packagebuild.py b/lib/lp/buildmaster/interfaces/packagebuild.py
50index d911ad3..8d6b836 100644
51--- a/lib/lp/buildmaster/interfaces/packagebuild.py
52+++ b/lib/lp/buildmaster/interfaces/packagebuild.py
53@@ -70,7 +70,7 @@ class IPackageBuild(IBuildFarmJob):
54 description=_("Shortcut for its distribution series.")))
55
56 def verifySuccessfulUpload():
57- """Verify that the upload of this build completed succesfully."""
58+ """Verify that the upload of this build completed successfully."""
59
60 def storeUploadLog(content):
61 """Store the given content as the build upload_log.
62diff --git a/lib/lp/codehosting/puller/scheduler.py b/lib/lp/codehosting/puller/scheduler.py
63index 1c828a2..f6a6538 100644
64--- a/lib/lp/codehosting/puller/scheduler.py
65+++ b/lib/lp/codehosting/puller/scheduler.py
66@@ -170,7 +170,7 @@ class PullerMonitorProtocol(ProcessMonitorProtocolWithTimeout,
67 """Construct an instance of the protocol, for listening to a worker.
68
69 :param deferred: A Deferred that will be fired when the worker has
70- finished (either successfully or unsuccesfully).
71+ finished (either successfully or unsuccessfully).
72 :param listener: A PullerMaster object that is notified when the
73 protocol receives events from the worker.
74 :param clock: A provider of Twisted's IReactorTime. This parameter
75diff --git a/lib/lp/codehosting/puller/tests/test_acceptance.py b/lib/lp/codehosting/puller/tests/test_acceptance.py
76index 621bcc8..66a3491 100644
77--- a/lib/lp/codehosting/puller/tests/test_acceptance.py
78+++ b/lib/lp/codehosting/puller/tests/test_acceptance.py
79@@ -57,7 +57,7 @@ class TestBranchPuller(PullerBranchTestCase, LoomTestMixin):
80 local_path_from_url(config.launchpad.bzr_imports_root_url))
81
82 def assertMirrored(self, db_branch, source_branch):
83- """Assert that 'db_branch' was mirrored succesfully.
84+ """Assert that 'db_branch' was mirrored successfully.
85
86 This method checks that the fields on db_branch show that the branch
87 has been mirrored successfully, and checks that the Bazaar source and
88diff --git a/lib/lp/registry/javascript/tests/test_structural_subscription.js b/lib/lp/registry/javascript/tests/test_structural_subscription.js
89index af4433c..ed9afc1 100644
90--- a/lib/lp/registry/javascript/tests/test_structural_subscription.js
91+++ b/lib/lp/registry/javascript/tests/test_structural_subscription.js
92@@ -867,7 +867,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
93 }
94 };
95
96- // Now we need an lp_client that will appear to succesfully create
97+ // Now we need an lp_client that will appear to successfully create
98 // the filter but then fail to patch it.
99 var TestClient = function() {};
100 TestClient.prototype = {
101@@ -1075,7 +1075,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
102 };
103 }
104 };
105- // We need an lp_client that will appear to succesfully create the
106+ // We need an lp_client that will appear to successfully create the
107 // bug filter.
108 var TestClient = function() {};
109 TestClient.prototype = {
110@@ -1206,7 +1206,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
111 return this._data;
112 }
113 };
114- // We need an lp_client that will appear to succesfully create the
115+ // We need an lp_client that will appear to successfully create the
116 // bug filter.
117 var TestClient = function() {
118 this.post_called = false;
119diff --git a/lib/lp/services/twistedsupport/processmonitor.py b/lib/lp/services/twistedsupport/processmonitor.py
120index f80b7d1..e7e3189 100644
121--- a/lib/lp/services/twistedsupport/processmonitor.py
122+++ b/lib/lp/services/twistedsupport/processmonitor.py
123@@ -135,7 +135,7 @@ class ProcessMonitorProtocol(ProcessProtocolWithTwoStageKill):
124 """Construct an instance of the protocol, for listening to a worker.
125
126 :param deferred: A Deferred that will be fired when the subprocess has
127- finished (either successfully or unsuccesfully).
128+ finished (either successfully or unsuccessfully).
129 """
130 ProcessProtocolWithTwoStageKill.__init__(self, clock)
131 self._deferred = deferred

Subscribers

People subscribed via source and target branches

to status/vote changes: