Merge ~jugmac00/launchpad:fix-typos-in-archive.py-and-related-files into launchpad:master

Proposed by Jürgen Gmach
Status: Merged
Approved by: Jürgen Gmach
Approved revision: 00766f6788d7442e4bcce623dec6e58ac455e913
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~jugmac00/launchpad:fix-typos-in-archive.py-and-related-files
Merge into: launchpad:master
Diff against target: 66 lines (+6/-6)
3 files modified
lib/lp/soyuz/doc/package-diff.rst (+1/-1)
lib/lp/soyuz/model/archive.py (+4/-4)
lib/lp/soyuz/scripts/ftpmasterbase.py (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+431719@code.launchpad.net

Commit message

Fix typos

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

No need to review - I'll self-approve once CI checks have finished.

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/soyuz/doc/package-diff.rst b/lib/lp/soyuz/doc/package-diff.rst
2index 9a4302b..9591382 100644
3--- a/lib/lp/soyuz/doc/package-diff.rst
4+++ b/lib/lp/soyuz/doc/package-diff.rst
5@@ -349,7 +349,7 @@ Performing the diff.
6
7 >>> diff.performDiff()
8
9-The record is immediatelly updated, now the record contains a
10+The record is immediately updated, now the record contains a
11 'date_fulfilled', its status is COMPLETED and 'diff_content' points
12 to a LibraryFileAlias with a proper mimetype.
13
14diff --git a/lib/lp/soyuz/model/archive.py b/lib/lp/soyuz/model/archive.py
15index a0dbbbc..61acec4 100644
16--- a/lib/lp/soyuz/model/archive.py
17+++ b/lib/lp/soyuz/model/archive.py
18@@ -618,7 +618,7 @@ class Archive(SQLBase):
19 def load_api_extra_objects(rows):
20 """Load extra related-objects needed by API calls."""
21 # Pre-cache related `PackageUpload`s and `PackageUploadSource`s
22- # which are immediatelly used in the API context for checking
23+ # which are immediately used in the API context for checking
24 # permissions on the returned entries.
25 uploads = load_related(PackageUpload, rows, ["packageupload_id"])
26 pu_sources = load_referencing(
27@@ -627,7 +627,7 @@ class Archive(SQLBase):
28 for pu_source in pu_sources:
29 upload = pu_source.packageupload
30 get_property_cache(upload).sources = [pu_source]
31- # Pre-cache `SourcePackageName`s which are immediatelly used
32+ # Pre-cache `SourcePackageName`s which are immediately used
33 # in the API context for materializing the returned entries.
34 # XXX cprov 2014-04-23: load_related() does not support
35 # nested attributes as foreign keys (uses getattr instead of
36@@ -1212,7 +1212,7 @@ class Archive(SQLBase):
37 DistroSeriesPackageCache,
38 )
39
40- # Compiled regexp to remove puntication.
41+ # Compiled regexp to remove punctuation.
42 clean_text = re.compile(r"(,|;|:|\.|\?|!)")
43
44 # XXX cprov 20080402 bug=207969: The set() is only used because we
45@@ -2950,7 +2950,7 @@ class Archive(SQLBase):
46 return [PackagePublishingPocket.RELEASE]
47
48 # Cast to a list so we don't trip up with the security proxy not
49- # understandiung EnumItems.
50+ # understanding EnumItems.
51 return list(PackagePublishingPocket.items)
52
53 def _getExistingOverrideSequence(
54diff --git a/lib/lp/soyuz/scripts/ftpmasterbase.py b/lib/lp/soyuz/scripts/ftpmasterbase.py
55index be0b0f4..f25e0d8 100644
56--- a/lib/lp/soyuz/scripts/ftpmasterbase.py
57+++ b/lib/lp/soyuz/scripts/ftpmasterbase.py
58@@ -195,7 +195,7 @@ class SoyuzScript(LaunchpadScript):
59 """Script finalization procedure.
60
61 'dry-run' command-line option will case the transaction to be
62- immediatelly aborted.
63+ immediately aborted.
64
65 In normal mode it will ask for user confirmation (see
66 `waitForUserConfirmation`) and will commit the transaction or abort

Subscribers

People subscribed via source and target branches

to status/vote changes: