1 |
Fix the slot conflict solver to use the _want_installed_pkg |
2 |
method to identify installed packages that are intended to |
3 |
be reinstalled for some reason (such as @preserved-rebuild). |
4 |
|
5 |
X-Gentoo-bug: 632202 |
6 |
X-Gentoo-bug-url: https://bugs.gentoo.org/632202 |
7 |
--- |
8 |
pym/_emerge/depgraph.py | 3 ++- |
9 |
1 file changed, 2 insertions(+), 1 deletion(-) |
10 |
|
11 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
12 |
index 3b81c5c76..b0149c4dc 100644 |
13 |
--- a/pym/_emerge/depgraph.py |
14 |
+++ b/pym/_emerge/depgraph.py |
15 |
@@ -1337,7 +1337,8 @@ class depgraph(object): |
16 |
self._dynamic_config._parent_atoms.get(pkg, [])) |
17 |
|
18 |
for parent, atom in all_parent_atoms: |
19 |
- is_arg_parent = isinstance(parent, AtomArg) |
20 |
+ is_arg_parent = (inst_pkg is not None and |
21 |
+ not self._want_installed_pkg(inst_pkg)) |
22 |
is_non_conflict_parent = parent not in conflict_pkgs and \ |
23 |
parent not in indirect_conflict_pkgs |
24 |
|
25 |
-- |
26 |
2.13.5 |