Fix the slot conflict solver to use the _want_installed_pkg
method to identify installed packages that are intended to
be reinstalled for some reason (such as @preserved-rebuild).

X-Gentoo-bug: 632202
X-Gentoo-bug-url: https://bugs.gentoo.org/632202
---
 pym/_emerge/depgraph.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 3b81c5c76..b0149c4dc 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1337,7 +1337,8 @@ class depgraph(object):
                                        
self._dynamic_config._parent_atoms.get(pkg, []))
 
                        for parent, atom in all_parent_atoms:
-                               is_arg_parent = isinstance(parent, AtomArg)
+                               is_arg_parent = (inst_pkg is not None and
+                                       not self._want_installed_pkg(inst_pkg))
                                is_non_conflict_parent = parent not in 
conflict_pkgs and \
                                        parent not in indirect_conflict_pkgs
 
-- 
2.13.5


Reply via email to