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

Proposed by Jürgen Gmach
Status: Merged
Approved by: Jürgen Gmach
Approved revision: 095d831977a0c5890e2e655c6df8924478a2f074
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~jugmac00/launchpad:fix-some-more-typos
Merge into: launchpad:master
Diff against target: 196 lines (+16/-16)
13 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/registry/tests/test_prf_walker.py (+1/-1)
lib/lp/services/twistedsupport/processmonitor.py (+1/-1)
lib/lp/soyuz/interfaces/binarypackagebuild.py (+1/-1)
lib/lp/soyuz/interfaces/publishing.py (+1/-1)
lib/lp/soyuz/interfaces/queue.py (+1/-1)
lib/lp/soyuz/scripts/tests/test_populatearchive.py (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+410792@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
diff --git a/lib/lp/archiveuploader/uploadprocessor.py b/lib/lp/archiveuploader/uploadprocessor.py
index 1f22f50..2081a51 100644
--- a/lib/lp/archiveuploader/uploadprocessor.py
+++ b/lib/lp/archiveuploader/uploadprocessor.py
@@ -299,7 +299,7 @@ class UploadHandler:
299 archive) = parse_upload_path(relative_path)299 archive) = parse_upload_path(relative_path)
300 except UploadPathError as e:300 except UploadPathError as e:
301 # pick some defaults to create the NascentUpload() object.301 # pick some defaults to create the NascentUpload() object.
302 # We will be rejecting the upload so it doesn matter much.302 # We will be rejecting the upload so it doesn't matter much.
303 distribution = getUtility(IDistributionSet)['ubuntu']303 distribution = getUtility(IDistributionSet)['ubuntu']
304 suite_name = None304 suite_name = None
305 archive = distribution.main_archive305 archive = distribution.main_archive
@@ -436,7 +436,7 @@ class UploadHandler:
436 return result436 return result
437437
438 def removeUpload(self, logger):438 def removeUpload(self, logger):
439 """Remove an upload that has succesfully been processed.439 """Remove an upload that has successfully been processed.
440440
441 :param logger: The logger to use for logging results.441 :param logger: The logger to use for logging results.
442 """442 """
diff --git a/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py b/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py
index 33bea04..7cf69c3 100644
--- a/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py
+++ b/lib/lp/bugs/scripts/checkwatches/tests/test_scheduler.py
@@ -52,7 +52,7 @@ class TestBugWatchScheduler(TestCaseWithFactory):
52 # If a watch has been checked and has never failed its next52 # If a watch has been checked and has never failed its next
53 # check will be scheduled for 24 hours after its last check.53 # check will be scheduled for 24 hours after its last check.
54 now = datetime.now(utc)54 now = datetime.now(utc)
55 # Add some succesful activity to ensure that successful activity55 # Add some successful activity to ensure that successful activity
56 # is handled correctly.56 # is handled correctly.
57 self.bug_watch.addActivity()57 self.bug_watch.addActivity()
58 self.bug_watch.lastchecked = now58 self.bug_watch.lastchecked = now
diff --git a/lib/lp/buildmaster/doc/buildqueue.txt b/lib/lp/buildmaster/doc/buildqueue.txt
index 6370c40..92a0650 100644
--- a/lib/lp/buildmaster/doc/buildqueue.txt
+++ b/lib/lp/buildmaster/doc/buildqueue.txt
@@ -10,7 +10,7 @@ initialization.
10BuildQueue should provide all the information needed for dispatching10BuildQueue should provide all the information needed for dispatching
11and collecting build results.11and collecting build results.
1212
13As soon as a build job is processed succesfully (dispatched &13As soon as a build job is processed successfully (dispatched &
14collected) the BuildQueue record representing it is removed.14collected) the BuildQueue record representing it is removed.
1515
16 >>> from lp.testing import verifyObject16 >>> from lp.testing import verifyObject
diff --git a/lib/lp/buildmaster/interfaces/packagebuild.py b/lib/lp/buildmaster/interfaces/packagebuild.py
index d911ad3..8d6b836 100644
--- a/lib/lp/buildmaster/interfaces/packagebuild.py
+++ b/lib/lp/buildmaster/interfaces/packagebuild.py
@@ -70,7 +70,7 @@ class IPackageBuild(IBuildFarmJob):
70 description=_("Shortcut for its distribution series.")))70 description=_("Shortcut for its distribution series.")))
7171
72 def verifySuccessfulUpload():72 def verifySuccessfulUpload():
73 """Verify that the upload of this build completed succesfully."""73 """Verify that the upload of this build completed successfully."""
7474
75 def storeUploadLog(content):75 def storeUploadLog(content):
76 """Store the given content as the build upload_log.76 """Store the given content as the build upload_log.
diff --git a/lib/lp/codehosting/puller/scheduler.py b/lib/lp/codehosting/puller/scheduler.py
index 1c828a2..f6a6538 100644
--- a/lib/lp/codehosting/puller/scheduler.py
+++ b/lib/lp/codehosting/puller/scheduler.py
@@ -170,7 +170,7 @@ class PullerMonitorProtocol(ProcessMonitorProtocolWithTimeout,
170 """Construct an instance of the protocol, for listening to a worker.170 """Construct an instance of the protocol, for listening to a worker.
171171
172 :param deferred: A Deferred that will be fired when the worker has172 :param deferred: A Deferred that will be fired when the worker has
173 finished (either successfully or unsuccesfully).173 finished (either successfully or unsuccessfully).
174 :param listener: A PullerMaster object that is notified when the174 :param listener: A PullerMaster object that is notified when the
175 protocol receives events from the worker.175 protocol receives events from the worker.
176 :param clock: A provider of Twisted's IReactorTime. This parameter176 :param clock: A provider of Twisted's IReactorTime. This parameter
diff --git a/lib/lp/codehosting/puller/tests/test_acceptance.py b/lib/lp/codehosting/puller/tests/test_acceptance.py
index 621bcc8..66a3491 100644
--- a/lib/lp/codehosting/puller/tests/test_acceptance.py
+++ b/lib/lp/codehosting/puller/tests/test_acceptance.py
@@ -57,7 +57,7 @@ class TestBranchPuller(PullerBranchTestCase, LoomTestMixin):
57 local_path_from_url(config.launchpad.bzr_imports_root_url))57 local_path_from_url(config.launchpad.bzr_imports_root_url))
5858
59 def assertMirrored(self, db_branch, source_branch):59 def assertMirrored(self, db_branch, source_branch):
60 """Assert that 'db_branch' was mirrored succesfully.60 """Assert that 'db_branch' was mirrored successfully.
6161
62 This method checks that the fields on db_branch show that the branch62 This method checks that the fields on db_branch show that the branch
63 has been mirrored successfully, and checks that the Bazaar source and63 has been mirrored successfully, and checks that the Bazaar source and
diff --git a/lib/lp/registry/javascript/tests/test_structural_subscription.js b/lib/lp/registry/javascript/tests/test_structural_subscription.js
index af4433c..ed9afc1 100644
--- a/lib/lp/registry/javascript/tests/test_structural_subscription.js
+++ b/lib/lp/registry/javascript/tests/test_structural_subscription.js
@@ -867,7 +867,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
867 }867 }
868 };868 };
869869
870 // Now we need an lp_client that will appear to succesfully create870 // Now we need an lp_client that will appear to successfully create
871 // the filter but then fail to patch it.871 // the filter but then fail to patch it.
872 var TestClient = function() {};872 var TestClient = function() {};
873 TestClient.prototype = {873 TestClient.prototype = {
@@ -1075,7 +1075,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
1075 };1075 };
1076 }1076 }
1077 };1077 };
1078 // We need an lp_client that will appear to succesfully create the1078 // We need an lp_client that will appear to successfully create the
1079 // bug filter.1079 // bug filter.
1080 var TestClient = function() {};1080 var TestClient = function() {};
1081 TestClient.prototype = {1081 TestClient.prototype = {
@@ -1206,7 +1206,7 @@ YUI.add('lp.structural_subscription.test', function (Y) {
1206 return this._data;1206 return this._data;
1207 }1207 }
1208 };1208 };
1209 // We need an lp_client that will appear to succesfully create the1209 // We need an lp_client that will appear to successfully create the
1210 // bug filter.1210 // bug filter.
1211 var TestClient = function() {1211 var TestClient = function() {
1212 this.post_called = false;1212 this.post_called = false;
diff --git a/lib/lp/registry/tests/test_prf_walker.py b/lib/lp/registry/tests/test_prf_walker.py
index cf82294..04012e1 100644
--- a/lib/lp/registry/tests/test_prf_walker.py
+++ b/lib/lp/registry/tests/test_prf_walker.py
@@ -117,7 +117,7 @@ class WalkerBase_Base(TestCase):
117 self.assertEqual(w.path, "/path/to/something/")117 self.assertEqual(w.path, "/path/to/something/")
118118
119 def testAddsSlashToPath(self):119 def testAddsSlashToPath(self):
120 """WalkerBase adds a trailing slash to path if ommitted."""120 """WalkerBase adds a trailing slash to path if omitted."""
121 w = WalkerBase("ftp://localhost/path/to/something")121 w = WalkerBase("ftp://localhost/path/to/something")
122 self.assertEqual(w.path, "/path/to/something/")122 self.assertEqual(w.path, "/path/to/something/")
123123
diff --git a/lib/lp/services/twistedsupport/processmonitor.py b/lib/lp/services/twistedsupport/processmonitor.py
index f80b7d1..e7e3189 100644
--- a/lib/lp/services/twistedsupport/processmonitor.py
+++ b/lib/lp/services/twistedsupport/processmonitor.py
@@ -135,7 +135,7 @@ class ProcessMonitorProtocol(ProcessProtocolWithTwoStageKill):
135 """Construct an instance of the protocol, for listening to a worker.135 """Construct an instance of the protocol, for listening to a worker.
136136
137 :param deferred: A Deferred that will be fired when the subprocess has137 :param deferred: A Deferred that will be fired when the subprocess has
138 finished (either successfully or unsuccesfully).138 finished (either successfully or unsuccessfully).
139 """139 """
140 ProcessProtocolWithTwoStageKill.__init__(self, clock)140 ProcessProtocolWithTwoStageKill.__init__(self, clock)
141 self._deferred = deferred141 self._deferred = deferred
diff --git a/lib/lp/soyuz/interfaces/binarypackagebuild.py b/lib/lp/soyuz/interfaces/binarypackagebuild.py
index 3fedd8c..0f7aeb9 100644
--- a/lib/lp/soyuz/interfaces/binarypackagebuild.py
+++ b/lib/lp/soyuz/interfaces/binarypackagebuild.py
@@ -412,7 +412,7 @@ class IBinaryPackageBuildSet(ISpecificBuildFarmJobSource):
412 arch_tag=None):412 arch_tag=None):
413 """Retrieve `IBinaryPackageBuild`s for a given Distribution/DS/DAS.413 """Retrieve `IBinaryPackageBuild`s for a given Distribution/DS/DAS.
414414
415 Optionally, for a given status and/or pocket, if ommited return all415 Optionally, for a given status and/or pocket, if omitted return all
416 records. If name is passed return only the builds which the416 records. If name is passed return only the builds which the
417 sourcepackagename matches (SQL LIKE).417 sourcepackagename matches (SQL LIKE).
418 """418 """
diff --git a/lib/lp/soyuz/interfaces/publishing.py b/lib/lp/soyuz/interfaces/publishing.py
index 2aaba34..35dff3b 100644
--- a/lib/lp/soyuz/interfaces/publishing.py
+++ b/lib/lp/soyuz/interfaces/publishing.py
@@ -1006,7 +1006,7 @@ class IPublishingSet(Interface):
1006 ids.1006 ids.
1007 :type archive: `IArchive`1007 :type archive: `IArchive`
1008 :param build_states: optional list of build states to which the1008 :param build_states: optional list of build states to which the
1009 result will be limited. Defaults to all states if ommitted.1009 result will be limited. Defaults to all states if omitted.
1010 :type build_states: ``list`` or None1010 :type build_states: ``list`` or None
1011 :param need_build_farm_job: whether to include the `PackageBuild`1011 :param need_build_farm_job: whether to include the `PackageBuild`
1012 and `BuildFarmJob` in the result.1012 and `BuildFarmJob` in the result.
diff --git a/lib/lp/soyuz/interfaces/queue.py b/lib/lp/soyuz/interfaces/queue.py
index b328a58..f898203 100644
--- a/lib/lp/soyuz/interfaces/queue.py
+++ b/lib/lp/soyuz/interfaces/queue.py
@@ -774,7 +774,7 @@ class IPackageUploadSet(Interface):
774 def count(status=None, distroseries=None, pocket=None):774 def count(status=None, distroseries=None, pocket=None):
775 """Number of IPackageUpload present in a given status.775 """Number of IPackageUpload present in a given status.
776776
777 If status is ommitted return the number of all entries.777 If status is omitted return the number of all entries.
778 'distroseries' is optional and restrict the results in given778 'distroseries' is optional and restrict the results in given
779 distroseries, same for pocket.779 distroseries, same for pocket.
780 """780 """
diff --git a/lib/lp/soyuz/scripts/tests/test_populatearchive.py b/lib/lp/soyuz/scripts/tests/test_populatearchive.py
index 92cd841..228deb7 100644
--- a/lib/lp/soyuz/scripts/tests/test_populatearchive.py
+++ b/lib/lp/soyuz/scripts/tests/test_populatearchive.py
@@ -214,7 +214,7 @@ class TestPopulateArchiveScript(TestCaseWithFactory):
214 ]214 ]
215215
216 # Empty reason string indicates that the '--reason' command line216 # Empty reason string indicates that the '--reason' command line
217 # argument should be ommitted.217 # argument should be omitted.
218 if reason is not None and not reason.isspace():218 if reason is not None and not reason.isspace():
219 script_args.extend(['--reason', reason])219 script_args.extend(['--reason', reason])
220 elif reason is None:220 elif reason is None:

Subscribers

People subscribed via source and target branches

to status/vote changes: