[gentoo-commits] proj/portage:master commit in: lib/_emerge/resolver/, lib/_emerge/, lib/portage/dep/

[gentoo-commits] proj/portage:master commit in: lib/_emerge/resolver/, lib/_emerge/, lib/portage/dep/

[Sam James]

commit:     32d6700c84d4c41392f26eab89ffb48c6a4104fd
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Feb 11 02:14:10 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 02:54:54 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=32d6700c

Fix issues causing CI to fail

Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/portage/pull/985
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/_emerge/AbstractEbuildProcess.py | 4 +++-
 lib/_emerge/resolver/backtracking.py | 2 +-
 lib/portage/dep/__init__.py          | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/_emerge/AbstractEbuildProcess.py b/lib/_emerge/AbstractEbuildProcess.py
index f457e4609..0e6786eed 100644
--- a/lib/_emerge/AbstractEbuildProcess.py
+++ b/lib/_emerge/AbstractEbuildProcess.py
@@ -27,7 +27,9 @@ portage.proxy.lazyimport.lazyimport(
 
 
 class AbstractEbuildProcess(SpawnProcess):
-    __slots__ = ("phase", "settings",) + (
+    __slots__ = (
+        "phase",
+        "settings",
         "_build_dir",
         "_build_dir_unlock",
         "_ipc_daemon",

diff --git a/lib/_emerge/resolver/backtracking.py b/lib/_emerge/resolver/backtracking.py
index 6fbfdd89c..9cbe65411 100644
--- a/lib/_emerge/resolver/backtracking.py
+++ b/lib/_emerge/resolver/backtracking.py
@@ -270,7 +270,7 @@ class Backtracker:
         # Not all config changes require a restart, that's why they can appear together
         # with other conflicts.
         if "config" in infos:
-            self._feedback_config(infos["config"], explore=(len(infos) == 1))
+            self._feedback_config(infos["config"], explore=len(infos) == 1)
 
         # There is at most one of the following types of conflicts for a given restart.
         if "slot conflict" in infos:

diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 889d98263..d0c5a45cc 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -1499,8 +1499,8 @@ class Atom(str):
                 allow_build_id = True
 
         blocker_prefix = ""
-        if "!" == s[:1]:
-            blocker = self._blocker(forbid_overlap=("!" == s[1:2]))
+        if s[:1] == "!":
+            blocker = self._blocker(forbid_overlap=s[1:2] == "!")
             if blocker.overlap.forbid:
                 blocker_prefix = s[:2]
                 s = s[2:]