Re: [gentoo-portage-dev] Re: [PATCH] _expand_new_virtuals: constrain output for dep_zapdeps (bug 597752)

[Zac Medico]

On 11/03/2016 03:46 PM, Brian Dolbec wrote:
> On Thu, 3 Nov 2016 13:34:22 -0700
> Zac Medico <zmedico@g.o> wrote:
>
>> On 10/30/2016 11:15 PM, Zac Medico wrote:
>>> Constrain _expand_new_virtuals output in order to avoid incorrect
>>> re-ordering of || deps in the dep_zapdeps function, as reported in
>>> bug 597752.
>>>
>>> The incorrect dep_zapdeps behavior involved a problem in the
>>> construction of the _dep_choice.cp_map dictionary inside the
>>> dep_zapdeps function, with this input:
>>>
>>> || ( dev-java/icedtea-bin:8 =virtual/jdk-1.8.0-r3 >=virtual/jdk-1.5
>>> ) ( dev-java/icedtea-bin:7 =virtual/jdk-1.7.0-r2 >=virtual/jdk-1.5 )
>>>
>>> The cp_map for virtual/jdk-1.7.0-r2 erroneously contained
>>> virtual/jdk-1.8.0-r3 because that was the highest virtual/jdk
>>> matched by the >=virtual/jdk-1.5 atom. This patch removes the
>>>> =virtual/jdk-1.5 atom from the _expand_new_virtuals output, in
>>>> order to avoid triggering
>>> the erroneous dep_zapdeps behavior. The >=virtual/jdk-1.5 atom is
>>> not completely discarded, since the depgraph is able to access it
>>> via the virt_atom._orig_atom attribute.
>>>
>>> In order to demonstrate that this patch solves the problem, run the
>>> command `emerge ant-core` from inside a stage3 chroot, and see that
>>> virtual/jdk:1.8 is favored over virtual/jdk:1.7.
>>>
>>> X-Gentoo-Bug: 597752
>>> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=597752
>>
>> Any feedback?
>
>
> Sorry, I was behind on emails from the weekend.
>
> This stuff is dabbling into the dep calc voodo ;)  But I ddin't see any
> typo's :)   I trust you got it right.
>

Thanks, pushed:

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