| 1 |
On Fri, 29 Sep 2017 01:15:59 -0700 |
| 2 |
Zac Medico <zmedico@g.o> wrote: |
| 3 |
|
| 4 |
> Fix the slot conflict solver to use the _want_installed_pkg |
| 5 |
> method to identify installed packages that are intended to |
| 6 |
> be reinstalled for some reason (such as @preserved-rebuild). |
| 7 |
> |
| 8 |
> X-Gentoo-bug: 632202 |
| 9 |
> X-Gentoo-bug-url: https://bugs.gentoo.org/632202 |
| 10 |
> --- |
| 11 |
> pym/_emerge/depgraph.py | 3 ++- |
| 12 |
> 1 file changed, 2 insertions(+), 1 deletion(-) |
| 13 |
> |
| 14 |
> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
> index 3b81c5c76..b0149c4dc 100644 |
| 16 |
> --- a/pym/_emerge/depgraph.py |
| 17 |
> +++ b/pym/_emerge/depgraph.py |
| 18 |
> @@ -1337,7 +1337,8 @@ class depgraph(object): |
| 19 |
> self._dynamic_config._parent_atoms.get(pkg, |
| 20 |
> [])) |
| 21 |
> for parent, atom in all_parent_atoms: |
| 22 |
> - is_arg_parent = isinstance(parent, |
| 23 |
> AtomArg) |
| 24 |
> + is_arg_parent = (inst_pkg is not |
| 25 |
> None and |
| 26 |
> + not |
| 27 |
> self._want_installed_pkg(inst_pkg)) is_non_conflict_parent = parent |
| 28 |
> not in conflict_pkgs and \ parent not in indirect_conflict_pkgs |
| 29 |
> |
| 30 |
|
| 31 |
|
| 32 |
looks good |
| 33 |
|
| 34 |
-- |
| 35 |
Brian Dolbec <dolsen> |
Archives