| 1 |
commit: d82bf7c0a2cfa9590849aa7fd3ea1257a7f45006 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 29 08:07:34 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 29 17:22:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d82bf7c0 |
| 7 |
|
| 8 |
_solve_..slot_conflicts: handle forced reinstall (bug 632202) |
| 9 |
|
| 10 |
Fix the slot conflict solver to use the _want_installed_pkg |
| 11 |
method to identify installed packages that are intended to |
| 12 |
be reinstalled for some reason (such as @preserved-rebuild). |
| 13 |
|
| 14 |
X-Gentoo-bug: 632202 |
| 15 |
X-Gentoo-bug-url: https://bugs.gentoo.org/632202 |
| 16 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 17 |
|
| 18 |
pym/_emerge/depgraph.py | 3 ++- |
| 19 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 22 |
index 3b81c5c76..b0149c4dc 100644 |
| 23 |
--- a/pym/_emerge/depgraph.py |
| 24 |
+++ b/pym/_emerge/depgraph.py |
| 25 |
@@ -1337,7 +1337,8 @@ class depgraph(object): |
| 26 |
self._dynamic_config._parent_atoms.get(pkg, [])) |
| 27 |
|
| 28 |
for parent, atom in all_parent_atoms: |
| 29 |
- is_arg_parent = isinstance(parent, AtomArg) |
| 30 |
+ is_arg_parent = (inst_pkg is not None and |
| 31 |
+ not self._want_installed_pkg(inst_pkg)) |
| 32 |
is_non_conflict_parent = parent not in conflict_pkgs and \ |
| 33 |
parent not in indirect_conflict_pkgs |
Archives