[gentoo-portage-dev] [PATCH] _solve_..slot_conflicts: handle forced reinstall (bug 632202)

[gentoo-portage-dev] [PATCH] _solve_..slot_conflicts: handle forced reinstall (bug 632202)

[Zac Medico]

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

Re: [gentoo-portage-dev] [PATCH] _solve_..slot_conflicts: handle forced reinstall (bug 632202)

[Brian Dolbec]

On Fri, 29 Sep 2017 01:15:59 -0700
Zac Medico <zmedico@gentoo.org> wrote:

> 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
>  


looks good

-- 
Brian Dolbec <dolsen>

Re: [gentoo-portage-dev] [PATCH] _solve_..slot_conflicts: handle forced reinstall (bug 632202)

[Zac Medico]

[-- Attachment #1.1: Type: text/plain, Size: 1273 bytes --]

On 09/29/2017 06:16 AM, Brian Dolbec wrote:
> On Fri, 29 Sep 2017 01:15:59 -0700
> Zac Medico <zmedico@gentoo.org> wrote:
> 
>> 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
>>  
> 
> 
> looks good
> 

Thanks, merged:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=d82bf7c0a2cfa9590849aa7fd3ea1257a7f45006
-- 
Thanks,
Zac


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 224 bytes --]