commit: 7402c4f2b9eef426134aca6a6ba71bbbd6389dac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 11:25:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 11:25:51 2024 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7402c4f2
lib/_emerge: codespell fixes
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/_emerge/depgraph.py | 2 +-
lib/_emerge/resolver/circular_dependency.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index efe084a780..a2865cad23 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -11927,7 +11927,7 @@ def _resume_depgraph(
) or parent_node.operation not in ("merge", "nomerge"):
continue
# We need to traverse all priorities here, in order to
- # ensure that a package with an unsatisfied depenedency
+ # ensure that a package with an unsatisfied dependency
# won't get pulled in, even indirectly via a soft
# dependency.
unsatisfied_stack.append((parent_node, atom))
diff --git a/lib/_emerge/resolver/circular_dependency.py
b/lib/_emerge/resolver/circular_dependency.py
index cd612e3130..6c21423083 100644
--- a/lib/_emerge/resolver/circular_dependency.py
+++ b/lib/_emerge/resolver/circular_dependency.py
@@ -189,7 +189,7 @@ class circular_dependency_handler:
if len(affecting_use) > self.MAX_AFFECTING_USE:
# Limit the number of combinations explored (bug #555698).
- # First, discard irrelevent flags that are not enabled.
+ # First, discard irrelevant flags that are not enabled.
# Since extract_affecting_use doesn't distinguish between
# positive and negative effects (flag? vs. !flag?), assume
# a positive relationship.
@@ -254,8 +254,8 @@ class circular_dependency_handler:
continue
# Check if a USE change conflicts with use requirements of the
parents.
- # If a requiremnet is hard, ignore the suggestion.
- # If the requirment is conditional, warn the user that other
changes might be needed.
+ # If a requirement is hard, ignore the suggestion.
+ # If the requirement is conditional, warn the user that other
changes might be needed.
followup_change = False
parent_parent_atoms =
self.depgraph._dynamic_config._parent_atoms.get(
changed_parent
