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