* [gentoo-commits] proj/portage:master commit in: lib/portage/env/, lib/portage/cache/, lib/portage/emaint/modules/sync/, ...
@ 2023-11-11 7:24 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2023-11-11 7:24 UTC (permalink / raw
To: gentoo-commits
commit: d0f3d286971e42f7dd2e20ea4df8d3f54845c6f4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 11 06:08:13 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 07:24:03 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d0f3d286
*/*: fix typos
Thanks to codespell.
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/install-qa-check.d/05double-D | 2 +-
lib/portage/_emirrordist/FetchIterator.py | 2 +-
lib/portage/_emirrordist/main.py | 2 +-
lib/portage/_sets/shell.py | 2 +-
lib/portage/binrepo/config.py | 2 +-
lib/portage/cache/mappings.py | 2 +-
lib/portage/cache/sql_template.py | 4 ++--
lib/portage/cache/sqlite.py | 4 ++--
lib/portage/cache/template.py | 10 +++++-----
lib/portage/dbapi/__init__.py | 2 +-
lib/portage/dbapi/porttree.py | 6 +++---
lib/portage/dbapi/vartree.py | 6 +++---
lib/portage/dep/__init__.py | 2 +-
lib/portage/dep/dep_check.py | 6 +++---
lib/portage/emaint/modules/merges/merges.py | 2 +-
lib/portage/emaint/modules/sync/sync.py | 2 +-
lib/portage/env/config.py | 2 +-
lib/portage/package/ebuild/_config/VirtualsManager.py | 4 ++--
lib/portage/package/ebuild/_config/env_var_validation.py | 2 +-
lib/portage/package/ebuild/_config/helper.py | 2 +-
lib/portage/package/ebuild/_metadata_invalid.py | 2 +-
lib/portage/package/ebuild/config.py | 2 +-
lib/portage/package/ebuild/doebuild.py | 4 ++--
lib/portage/package/ebuild/fetch.py | 2 +-
lib/portage/repository/config.py | 4 ++--
lib/portage/repository/storage/hardlink_quarantine.py | 2 +-
lib/portage/repository/storage/hardlink_rcu.py | 6 +++---
lib/portage/sync/modules/git/git.py | 4 ++--
lib/portage/sync/modules/rsync/rsync.py | 2 +-
lib/portage/sync/syncbase.py | 2 +-
lib/portage/util/_async/PipeLogger.py | 2 +-
lib/portage/util/_eventloop/asyncio_event_loop.py | 4 ++--
lib/portage/util/futures/extendedfutures.py | 2 +-
lib/portage/util/lafilefixer.py | 2 +-
lib/portage/util/mtimedb.py | 2 +-
lib/portage/util/writeable_check.py | 2 +-
lib/portage/xpak.py | 2 +-
37 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/bin/install-qa-check.d/05double-D b/bin/install-qa-check.d/05double-D
index 4b7737c0f3..b05e9b9317 100644
--- a/bin/install-qa-check.d/05double-D
+++ b/bin/install-qa-check.d/05double-D
@@ -1,4 +1,4 @@
-# Check for accidential install into ${D}/${D}
+# Check for accidental install into ${D}/${D}
DD_check() {
if [[ -d ${D%/}${D} ]] ; then
diff --git a/lib/portage/_emirrordist/FetchIterator.py b/lib/portage/_emirrordist/FetchIterator.py
index 0fd684e2ca..54a058bb53 100644
--- a/lib/portage/_emirrordist/FetchIterator.py
+++ b/lib/portage/_emirrordist/FetchIterator.py
@@ -194,7 +194,7 @@ def _async_fetch_tasks(config, hash_filter, repo_config, digests_future, cpv, lo
if override_fetch:
uri = uri.partition("+")[2]
- # skip fetch-restricted files unless overriden via fetch+
+ # skip fetch-restricted files unless overridden via fetch+
# or mirror+
if restrict_fetch and not override_fetch:
continue
diff --git a/lib/portage/_emirrordist/main.py b/lib/portage/_emirrordist/main.py
index dfddc3788d..989665ab8a 100644
--- a/lib/portage/_emirrordist/main.py
+++ b/lib/portage/_emirrordist/main.py
@@ -29,7 +29,7 @@ common_options = (
"longopt": "--verbose",
"shortopt": "-v",
"help": "display extra information on stderr "
- "(multiple occurences increase verbosity)",
+ "(multiple occurrences increase verbosity)",
"action": "count",
"default": 0,
},
diff --git a/lib/portage/_sets/shell.py b/lib/portage/_sets/shell.py
index 6f59bdbcdb..467a84efdd 100644
--- a/lib/portage/_sets/shell.py
+++ b/lib/portage/_sets/shell.py
@@ -23,7 +23,7 @@ class CommandOutputSet(PackageSet):
Args:
name: A string that identifies the set.
command: A string or sequence identifying the command to run
- (see the subprocess.Popen documentaion for the format)
+ (see the subprocess.Popen documentation for the format)
"""
_operations = ["merge", "unmerge"]
diff --git a/lib/portage/binrepo/config.py b/lib/portage/binrepo/config.py
index 8024f24d7c..5601a2e002 100644
--- a/lib/portage/binrepo/config.py
+++ b/lib/portage/binrepo/config.py
@@ -29,7 +29,7 @@ class BinRepoConfig:
def info_string(self):
"""
- Returns a formatted string containing informations about the repository.
+ Returns a formatted string containing information about the repository.
Used by emerge --info.
"""
indent = " " * 4
diff --git a/lib/portage/cache/mappings.py b/lib/portage/cache/mappings.py
index e7ee7df5cd..469f3dbc4a 100644
--- a/lib/portage/cache/mappings.py
+++ b/lib/portage/cache/mappings.py
@@ -69,7 +69,7 @@ class Mapping:
class MutableMapping(Mapping):
"""
- A mutable vesion of the Mapping class.
+ A mutable version of the Mapping class.
"""
__slots__ = ()
diff --git a/lib/portage/cache/sql_template.py b/lib/portage/cache/sql_template.py
index b9e92d0cea..ec058ab15a 100644
--- a/lib/portage/cache/sql_template.py
+++ b/lib/portage/cache/sql_template.py
@@ -13,7 +13,7 @@ class SQLDatabase(template.database):
_BaseError must be an exception class that all Exceptions thrown from the derived RDBMS are derived
from.
- SCHEMA_INSERT_CPV_INTO_PACKAGE should be modified dependant on the RDBMS, as should SCHEMA_PACKAGE_CREATE-
+ SCHEMA_INSERT_CPV_INTO_PACKAGE should be modified dependent on the RDBMS, as should SCHEMA_PACKAGE_CREATE-
basically you need to deal with creation of a unique pkgid. If the dbapi2 rdbms class has a method of
recovering that id, then modify _insert_cpv to remove the extra select.
@@ -69,7 +69,7 @@ class SQLDatabase(template.database):
def _initdb_con(self, config):
"""ensure needed tables are in place.
- If the derived class needs a different set of table creation commands, overload the approriate
+ If the derived class needs a different set of table creation commands, overload the appropriate
SCHEMA_ attributes. If it needs additional execution beyond, override"""
self._dbconnect(config)
diff --git a/lib/portage/cache/sqlite.py b/lib/portage/cache/sqlite.py
index 722b6b98d1..77dc8bc418 100644
--- a/lib/portage/cache/sqlite.py
+++ b/lib/portage/cache/sqlite.py
@@ -179,7 +179,7 @@ class database(fs_template.FsBased):
cursor.execute(v["create"])
def _db_table_exists(self, table_name):
- """return true/false dependant on a tbl existing"""
+ """return true/false dependent on a tbl existing"""
cursor = self._db_cursor
cursor.execute(
'SELECT name FROM sqlite_master WHERE type="table" AND name=%s'
@@ -188,7 +188,7 @@ class database(fs_template.FsBased):
return len(cursor.fetchall()) == 1
def _db_table_get_create(self, table_name):
- """return true/false dependant on a tbl existing"""
+ """return true/false dependent on a tbl existing"""
cursor = self._db_cursor
cursor.execute(
"SELECT sql FROM sqlite_master WHERE name=%s"
diff --git a/lib/portage/cache/template.py b/lib/portage/cache/template.py
index d869df93e2..9e69e368f5 100644
--- a/lib/portage/cache/template.py
+++ b/lib/portage/cache/template.py
@@ -11,7 +11,7 @@ import operator
class database:
# this is for metadata/cache transfer.
- # basically flags the cache needs be updated when transfered cache to cache.
+ # basically flags the cache needs be updated when transferred cache to cache.
# leave this.
complete_eclass_entries = True
@@ -32,7 +32,7 @@ class database:
def __getitem__(self, cpv):
"""set a cpv to values
- This shouldn't be overriden in derived classes since it handles the __eclasses__ conversion.
+ This shouldn't be overridden in derived classes since it handles the __eclasses__ conversion.
that said, if the class handles it, they can override it."""
if self.updates > self.sync_rate:
self.commit()
@@ -96,7 +96,7 @@ class database:
def _getitem(self, cpv):
"""get cpv's values.
- override this in derived classess"""
+ override this in derived classes"""
raise NotImplementedError
@staticmethod
@@ -120,7 +120,7 @@ class database:
def __setitem__(self, cpv, values):
"""set a cpv to values
- This shouldn't be overriden in derived classes since it handles the readonly checks
+ This shouldn't be overridden in derived classes since it handles the readonly checks
"""
if self.readonly:
raise cache_errors.ReadOnlyRestriction()
@@ -157,7 +157,7 @@ class database:
def __delitem__(self, cpv):
"""delete a key from the cache.
- This shouldn't be overriden in derived classes since it handles the readonly checks
+ This shouldn't be overridden in derived classes since it handles the readonly checks
"""
if self.readonly:
raise cache_errors.ReadOnlyRestriction()
diff --git a/lib/portage/dbapi/__init__.py b/lib/portage/dbapi/__init__.py
index dd697db109..09163e94d8 100644
--- a/lib/portage/dbapi/__init__.py
+++ b/lib/portage/dbapi/__init__.py
@@ -155,7 +155,7 @@ class dbapi:
def _pkg_str(self, cpv, repo):
"""
- This is used to contruct _pkg_str instances on-demand during
+ This is used to construct _pkg_str instances on-demand during
matching. If cpv is a _pkg_str instance with slot attribute,
then simply return it. Otherwise, fetch metadata and construct
a _pkg_str instance. This may raise KeyError or InvalidData.
diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py
index fdfb6ef521..eabf2d0a2a 100644
--- a/lib/portage/dbapi/porttree.py
+++ b/lib/portage/dbapi/porttree.py
@@ -550,7 +550,7 @@ class portdbapi(dbapi):
continue
mytrees.append(repo.location)
- # For optimal performace in this hot spot, we do manual unicode
+ # For optimal performance in this hot spot, we do manual unicode
# handling here instead of using the wrapped os module.
encoding = _encodings["fs"]
errors = "strict"
@@ -659,7 +659,7 @@ class portdbapi(dbapi):
mytree: Optional[str] = None,
myrepo: Optional[str] = None,
) -> list[str]:
- "stub code for returning auxilliary db information, such as SLOT, DEPEND, etc."
+ "stub code for returning auxiliary db information, such as SLOT, DEPEND, etc."
'input: "sys-apps/foo-1.0",["SLOT","DEPEND","HOMEPAGE"]'
'return: ["0",">=sys-libs/bar-1.0","http://www.foo.com"] or raise PortageKeyError if error'
# For external API consumers, self._event_loop returns a new event
@@ -924,7 +924,7 @@ class portdbapi(dbapi):
return result
def getfetchsizes(self, mypkg, useflags=None, debug=0, myrepo=None):
- # returns a filename:size dictionnary of remaining downloads
+ # returns a filename:size dictionary of remaining downloads
myebuild, mytree = self.findname2(mypkg, myrepo=myrepo)
if myebuild is None:
raise AssertionError(_("ebuild not found for '%s'") % mypkg)
diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
index 5638935606..11767a9f91 100644
--- a/lib/portage/dbapi/vartree.py
+++ b/lib/portage/dbapi/vartree.py
@@ -1581,7 +1581,7 @@ class vardbapi(dbapi):
def _iter_owners_low_mem(self, path_list):
"""
- This implemention will make a short-lived dblink instance (and
+ This implementation will make a short-lived dblink instance (and
parse CONTENTS) for every single installed package. This is
slower and but uses less memory than the method which uses the
basename cache.
@@ -4665,7 +4665,7 @@ class dblink:
for blocker in self._blockers or []:
blocker = self.vartree.dbapi._dblink(blocker.cpv)
# It may have been unmerged before lock(s)
- # were aquired.
+ # were acquired.
if blocker.exists():
blockers.append(blocker)
@@ -5395,7 +5395,7 @@ class dblink:
@param secondhand: A set of items to merge in pass two (usually
or symlinks that point to non-existing files that may get merged later)
@type secondhand: List
- @param stufftomerge: Either a diretory to merge, or a list of items.
+ @param stufftomerge: Either a directory to merge, or a list of items.
@type stufftomerge: String or List
@param cfgfiledict: { File:mtime } mapping for config_protected files
@type cfgfiledict: Dictionary
diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 7bdb8da763..a544221532 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -64,7 +64,7 @@ import portage.cache.mappings
# PMS 3.1.3: A slot name may contain any of the characters [A-Za-z0-9+_.-].
# It must not begin with a hyphen or a dot.
_slot_separator = ":"
-# loosly match SLOT, which may have an optional ABI part
+# loosely match SLOT, which may have an optional ABI part
_slot_loose = r"([\w+./*=-]+)"
_use = r"\[.*\]"
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index 9730b893b4..5ca0995a87 100644
--- a/lib/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
@@ -45,7 +45,7 @@ def _expand_new_virtuals(
expanded to || ( highest match ... lowest match ).
The result is normalized in the same way as use_reduce, having a top-level
- conjuction, and no redundant nested lists.
+ conjunction, and no redundant nested lists.
"""
newsplit = []
mytrees = trees[myroot]
@@ -427,7 +427,7 @@ def dep_zapdeps(
# Sort the deps into installed, not installed but already
# in the graph and other, not installed and not in the graph
- # and other, with values of [[required_atom], availablility]
+ # and other, with values of [[required_atom], availability]
for x, satisfied in zip(deps, satisfieds):
if isinstance(x, list):
atoms = dep_zapdeps(
@@ -743,7 +743,7 @@ def dep_zapdeps(
if minimize_slots:
# Prefer choices having fewer new slots. When used with DNF form,
- # this can eliminate unecessary packages that depclean would
+ # this can eliminate unnecessary packages that depclean would
# ultimately eliminate (see bug 632026). Only use this behavior
# when deemed necessary by the caller, since this will discard the
# order specified in the ebuild, and the preferences specified
diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py
index 8b9ccbf0e4..7c16b3e6c1 100644
--- a/lib/portage/emaint/modules/merges/merges.py
+++ b/lib/portage/emaint/modules/merges/merges.py
@@ -68,7 +68,7 @@ class TrackingFile:
def __iter__(self):
"""
- Provide an interator over failed merges.
+ Provide an iterator over failed merges.
@return: iterator of packages that failed to merge
"""
diff --git a/lib/portage/emaint/modules/sync/sync.py b/lib/portage/emaint/modules/sync/sync.py
index 49812b43f1..ea009d16c7 100644
--- a/lib/portage/emaint/modules/sync/sync.py
+++ b/lib/portage/emaint/modules/sync/sync.py
@@ -126,7 +126,7 @@ class SyncRepos:
"""Internal search, matches up the repo name or alias in repos.
@param repos: list of repo names or aliases to match
- @param avalable: list of repo objects to search
+ @param available: list of repo objects to search
@return: list of repo objects that match
"""
selected = []
diff --git a/lib/portage/env/config.py b/lib/portage/env/config.py
index 93ca162d87..3535802516 100644
--- a/lib/portage/env/config.py
+++ b/lib/portage/env/config.py
@@ -92,7 +92,7 @@ class PackageMaskFile(ConfigLoaderKlass):
"""
A class that implements a file-based package.mask
- Entires in package.mask are of the form:
+ Entries in package.mask are of the form:
atom1
atom2
or optionally
diff --git a/lib/portage/package/ebuild/_config/VirtualsManager.py b/lib/portage/package/ebuild/_config/VirtualsManager.py
index a5473a94f1..b0acf3c7dd 100644
--- a/lib/portage/package/ebuild/_config/VirtualsManager.py
+++ b/lib/portage/package/ebuild/_config/VirtualsManager.py
@@ -107,11 +107,11 @@ class VirtualsManager:
memo[id(self)] = result
# immutable attributes (internal policy ensures lack of mutation)
- # _treeVirtuals is initilised by _populate_treeVirtuals().
+ # _treeVirtuals is initialised by _populate_treeVirtuals().
# Before that it's 'None'.
result._treeVirtuals = self._treeVirtuals
memo[id(self._treeVirtuals)] = self._treeVirtuals
- # _dirVirtuals is initilised by __init__.
+ # _dirVirtuals is initialised by __init__.
result._dirVirtuals = self._dirVirtuals
memo[id(self._dirVirtuals)] = self._dirVirtuals
diff --git a/lib/portage/package/ebuild/_config/env_var_validation.py b/lib/portage/package/ebuild/_config/env_var_validation.py
index 82fddca03b..e00070926b 100644
--- a/lib/portage/package/ebuild/_config/env_var_validation.py
+++ b/lib/portage/package/ebuild/_config/env_var_validation.py
@@ -8,7 +8,7 @@ from portage.util import shlex_split
def validate_cmd_var(v):
"""
- Validate an evironment variable value to see if it
+ Validate an environment variable value to see if it
contains an executable command as the first token.
returns (valid, token_list) where 'valid' is boolean and 'token_list'
is the (possibly empty) list of tokens split by shlex.
diff --git a/lib/portage/package/ebuild/_config/helper.py b/lib/portage/package/ebuild/_config/helper.py
index 275d32cfef..1081b4da3c 100644
--- a/lib/portage/package/ebuild/_config/helper.py
+++ b/lib/portage/package/ebuild/_config/helper.py
@@ -50,7 +50,7 @@ def ordered_by_atom_specificity(cpdict, pkg, repo=None):
def prune_incremental(split):
"""
Prune off any parts of an incremental variable that are
- made irrelevant by the latest occuring * or -*. This
+ made irrelevant by the latest occurring * or -*. This
could be more aggressive but that might be confusing
and the point is just to reduce noise a bit.
"""
diff --git a/lib/portage/package/ebuild/_metadata_invalid.py b/lib/portage/package/ebuild/_metadata_invalid.py
index 607873cad5..310b21e9ec 100644
--- a/lib/portage/package/ebuild/_metadata_invalid.py
+++ b/lib/portage/package/ebuild/_metadata_invalid.py
@@ -24,7 +24,7 @@ def eapi_invalid(self, cpv, repo_name, settings, eapi_var, eapi_parsed, eapi_lin
if not eapi_parsed:
# None means the assignment was not found, while an
- # empty string indicates an (invalid) empty assingment.
+ # empty string indicates an (invalid) empty assignment.
msg.append(
f"\tvalid EAPI assignment must occur on or before line: {eapi_lineno}"
)
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 8a57e0c145..1c455eeacb 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -2839,7 +2839,7 @@ class config:
use_expand_unprefixed = self.get("USE_EXPAND_UNPREFIXED", "").split()
- # In order to best accomodate the long-standing practice of
+ # In order to best accommodate the long-standing practice of
# setting default USE_EXPAND variables in the profile's
# make.defaults, we translate these variables into their
# equivalent USE flags so that useful incremental behavior
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py
index ba166173a8..8c7a06b3e2 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -472,7 +472,7 @@ def doebuild_environment(
mysettings["SANDBOX_LOG"] = os.path.join(mysettings["T"], "sandbox.log")
mysettings["FILESDIR"] = os.path.join(settings["PORTAGE_BUILDDIR"], "files")
- # Prefix forward compatability
+ # Prefix forward compatibility
eprefix_lstrip = mysettings["EPREFIX"].lstrip(os.sep)
mysettings["ED"] = (
os.path.join(mysettings["D"], eprefix_lstrip).rstrip(os.sep) + os.sep
@@ -1903,7 +1903,7 @@ def spawn(
Sandbox: Sandbox means the spawned process will be limited in its ability t
read and write files (normally this means it is restricted to ${D}/)
SElinux Sandbox: Enables sandboxing on SElinux
- Reduced Privileges: Drops privilages such that the process runs as portage:portage
+ Reduced Privileges: Drops privileges such that the process runs as portage:portage
instead of as root.
Notes: os.system cannot be used because it messes with signal handling. Instead we
diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py
index 59a0afcf63..5f970fe62d 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -232,7 +232,7 @@ def _ensure_distdir(settings, distdir):
if "FAKED_MODE" in settings:
# When inside fakeroot, directories with portage's gid appear
# to have root's gid. Therefore, use root's gid instead of
- # portage's gid to avoid spurrious permissions adjustments
+ # portage's gid to avoid spurious permissions adjustments
# when inside fakeroot.
dir_gid = 0
diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py
index a01320fd76..a5b904dc6b 100644
--- a/lib/portage/repository/config.py
+++ b/lib/portage/repository/config.py
@@ -584,7 +584,7 @@ class RepoConfig:
def info_string(self):
"""
- Returns a formatted string containing informations about the repository.
+ Returns a formatted string containing information about the repository.
Used by emerge --info.
"""
indent = " " * 4
@@ -1379,7 +1379,7 @@ def parse_layout_conf(repo_location, repo_name=None):
data = {}
- # None indicates abscence of a masters setting, which later code uses
+ # None indicates absence of a masters setting, which later code uses
# to trigger a backward compatibility fallback that sets an implicit
# master. In order to avoid this fallback behavior, layout.conf can
# explicitly set masters to an empty value, which will result in an
diff --git a/lib/portage/repository/storage/hardlink_quarantine.py b/lib/portage/repository/storage/hardlink_quarantine.py
index a02d8b96e5..3fb1396fab 100644
--- a/lib/portage/repository/storage/hardlink_quarantine.py
+++ b/lib/portage/repository/storage/hardlink_quarantine.py
@@ -39,7 +39,7 @@ class HardlinkQuarantineRepoStorage(RepoStorageInterface):
"""
Run cmd and raise RepoStorageException on failure.
- @param cmd: command to executre
+ @param cmd: command to execute
@type cmd: list
"""
p = SpawnProcess(
diff --git a/lib/portage/repository/storage/hardlink_rcu.py b/lib/portage/repository/storage/hardlink_rcu.py
index 51a7ce435a..6f464c8d05 100644
--- a/lib/portage/repository/storage/hardlink_rcu.py
+++ b/lib/portage/repository/storage/hardlink_rcu.py
@@ -19,13 +19,13 @@ class HardlinkRcuRepoStorage(RepoStorageInterface):
Enable read-copy-update (RCU) behavior for sync operations. The
current latest immutable version of a repository will be
reference by a symlink found where the repository would normally
- be located. Repository consumers should resolve the cannonical
+ be located. Repository consumers should resolve the canonical
path of this symlink before attempt to access the repository,
and all operations should be read-only, since the repository
is considered immutable. Updates occur by atomic replacement
of the symlink, which causes new consumers to use the new
immutable version, while any earlier consumers continue to use
- the cannonical path that was resolved earlier.
+ the canonical path that was resolved earlier.
Performance is better than HardlinkQuarantineRepoStorage,
since commit involves atomic replacement of a symlink. Since
@@ -112,7 +112,7 @@ class HardlinkRcuRepoStorage(RepoStorageInterface):
"""
Run cmd and raise RepoStorageException on failure.
- @param cmd: command to executre
+ @param cmd: command to execute
@type cmd: list
@param privileged: run with maximum privileges
@type privileged: bool
diff --git a/lib/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py
index cf9ad1c134..44d739ce6b 100644
--- a/lib/portage/sync/modules/git/git.py
+++ b/lib/portage/sync/modules/git/git.py
@@ -188,7 +188,7 @@ class GitSync(NewBase):
#
# For sync-type=git repositories, we've seen a problem in the wild
# where shallow clones end up "breaking themselves" especially when
- # the origin is behing a CDN. 'git pull' might return state X,
+ # the origin is behind a CDN. 'git pull' might return state X,
# but on a subsequent pull, return state X-1. git will then (sometimes)
# leave orphaned untracked files in the repository. On a subsequent pull,
# when state >= X is returned where those files exist in the origin,
@@ -204,7 +204,7 @@ class GitSync(NewBase):
# 2.
# - volatile=no (explicitly set to no), OR
# - volatile is unset AND the repository owner is either root or portage
- # 3. Portage is syncing the respository (rather than e.g. auto-sync=no
+ # 3. Portage is syncing the repository (rather than e.g. auto-sync=no
# and never running 'emaint sync -r foo')
#
# Portage will not clobber if:
diff --git a/lib/portage/sync/modules/rsync/rsync.py b/lib/portage/sync/modules/rsync/rsync.py
index b095d6cb86..175c7f2e8e 100644
--- a/lib/portage/sync/modules/rsync/rsync.py
+++ b/lib/portage/sync/modules/rsync/rsync.py
@@ -585,7 +585,7 @@ class RsyncSync(NewBase):
"--force", # Force deletion on non-empty dirs
"--whole-file", # Don't do block transfers, only entire files
"--delete", # Delete files that aren't in the master tree
- "--stats", # Show final statistics about what was transfered
+ "--stats", # Show final statistics about what was transferred
"--human-readable",
"--timeout=" + str(self.timeout), # IO timeout if not done in X seconds
"--exclude=/distfiles", # Exclude distfiles from consideration
diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py
index 9c25a0299b..c3a07da7d7 100644
--- a/lib/portage/sync/syncbase.py
+++ b/lib/portage/sync/syncbase.py
@@ -55,7 +55,7 @@ class SyncBase:
@property
def has_bin(self):
- """Checks for existance of the external binary, and also
+ """Checks for existence of the external binary, and also
checks for storage driver configuration problems.
MUST only be called after _kwargs() has set the logger
diff --git a/lib/portage/util/_async/PipeLogger.py b/lib/portage/util/_async/PipeLogger.py
index cedd4b9f47..e5cabaa621 100644
--- a/lib/portage/util/_async/PipeLogger.py
+++ b/lib/portage/util/_async/PipeLogger.py
@@ -17,7 +17,7 @@ class PipeLogger(AbstractPollTask):
"""
This can be used for logging output of a child process,
- optionally outputing to log_file_path and/or stdout_fd. It can
+ optionally outputting to log_file_path and/or stdout_fd. It can
also monitor for EOF on input_fd, which may be used to detect
termination of a child process. If log_file_path ends with
'.gz' then the log file is written with compression.
diff --git a/lib/portage/util/_eventloop/asyncio_event_loop.py b/lib/portage/util/_eventloop/asyncio_event_loop.py
index 2b21e6dfaf..b9e96bb20e 100644
--- a/lib/portage/util/_eventloop/asyncio_event_loop.py
+++ b/lib/portage/util/_eventloop/asyncio_event_loop.py
@@ -121,7 +121,7 @@ class AsyncioEventLoop(_AbstractEventLoop):
"""
Portage internals use this as a layer of indirection in cases
where a wrapper around an asyncio.AbstractEventLoop implementation
- is needed for purposes of compatiblity.
+ is needed for purposes of compatibility.
@rtype: asyncio.AbstractEventLoop
@return: the internal event loop's AbstractEventLoop interface
@@ -130,7 +130,7 @@ class AsyncioEventLoop(_AbstractEventLoop):
def _run_until_complete(self, future):
"""
- An implementation of AbstractEventLoop.run_until_complete that supresses
+ An implementation of AbstractEventLoop.run_until_complete that suppresses
spurious error messages like the following reported in bug 655656:
Exception ignored when trying to write to the signal wakeup fd:
diff --git a/lib/portage/util/futures/extendedfutures.py b/lib/portage/util/futures/extendedfutures.py
index d7e3d37365..b772698b92 100644
--- a/lib/portage/util/futures/extendedfutures.py
+++ b/lib/portage/util/futures/extendedfutures.py
@@ -55,7 +55,7 @@ class ExtendedFuture(Future):
super().set_result(data)
def get(self, default=UNSET_CONST.result()):
- """Convienience function to wrap result() but adds an optional
+ """Convenience function to wrap result() but adds an optional
default value to return rather than raise an InvalidStateError
@param default: Optional override for the classwide default_result
diff --git a/lib/portage/util/lafilefixer.py b/lib/portage/util/lafilefixer.py
index 1fd97c2425..870c6d97b4 100644
--- a/lib/portage/util/lafilefixer.py
+++ b/lib/portage/util/lafilefixer.py
@@ -20,7 +20,7 @@ from portage.exception import InvalidData
# are ignored by libtool (last one wins), but we treat it as error (like
# lafilefixer does).
# What it does:
-# * Replaces all .la files with absolut paths in dependency_libs with
+# * Replaces all .la files with absolute paths in dependency_libs with
# corresponding -l* and -L* entries
# (/usr/lib64/libfoo.la -> -L/usr/lib64 -lfoo)
# * Moves various flags (see flag_re below) to inherited_linker_flags,
diff --git a/lib/portage/util/mtimedb.py b/lib/portage/util/mtimedb.py
index c18b74e266..cbd233dd1f 100644
--- a/lib/portage/util/mtimedb.py
+++ b/lib/portage/util/mtimedb.py
@@ -38,7 +38,7 @@ class MtimeDB(dict):
"""The MtimeDB class is used to interact with a file storing the
current resume lists.
It is a subclass of ``dict`` and it reads from/writes to JSON, by
- default, althouth it can be configured to use ``pickle``.
+ default, although it can be configured to use ``pickle``.
"""
# JSON read support has been available since portage-2.1.10.49.
diff --git a/lib/portage/util/writeable_check.py b/lib/portage/util/writeable_check.py
index d4397f6472..3427315cf7 100644
--- a/lib/portage/util/writeable_check.py
+++ b/lib/portage/util/writeable_check.py
@@ -49,7 +49,7 @@ def linux_ro_checker(dir_list):
errors="replace",
) as f:
for line in f:
- # we're interested in dir and both attr fileds which always
+ # we're interested in dir and both attr fields which always
# start with either 'ro' or 'rw'
# example line:
# 14 1 8:3 / / rw,noatime - ext3 /dev/root rw,errors=continue,commit=5,barrier=1,data=writeback
diff --git a/lib/portage/xpak.py b/lib/portage/xpak.py
index 9762ed7909..94a07a84cf 100644
--- a/lib/portage/xpak.py
+++ b/lib/portage/xpak.py
@@ -177,7 +177,7 @@ def xpak_mem(mydata):
def xsplit(infile):
"""(infile) -- Splits the infile into two files.
'infile.index' contains the index segment.
- 'infile.dat' contails the data segment."""
+ 'infile.dat' contains the data segment."""
infile = _unicode_decode(infile, encoding=_encodings["fs"], errors="strict")
myfile = open(
_unicode_encode(infile, encoding=_encodings["fs"], errors="strict"), "rb"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2023-11-11 7:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-11 7:24 [gentoo-commits] proj/portage:master commit in: lib/portage/env/, lib/portage/cache/, lib/portage/emaint/modules/sync/, Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox