Re: [gentoo-portage-dev] [PATCH] depgraph: make _minimize_children deterministic (bug 631894)

[Zac Medico]

On 09/24/2017 11:11 PM, Brian Dolbec wrote:
> On Sun, 24 Sep 2017 11:57:19 -0700
> Zac Medico <zmedico@g.o> wrote:
>
>> In order for the eliminate_pkg loop to produce deterministic results,
>> the order of the pkgs list must not be random. Prefer to eliminate
>> installed packages first, in case rebuilds are needed, and also sort
>> in ascending order so that older versions are eliminated first.
>>
>> X-Gentoo-bug: 631894
>> X-Gentoo-bug-url: https://bugs.gentoo.org/631894
>> ---
>>  pym/_emerge/depgraph.py | 9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
>> index b4fc5f297..785c036b8 100644
>> --- a/pym/_emerge/depgraph.py
>> +++ b/pym/_emerge/depgraph.py
>> @@ -3584,6 +3584,15 @@ class depgraph(object):
>>  						if
>> atom_set.findAtomForPackage(pkg2,
>> modified_use=self._pkg_use_enabled(pkg2)): atom_pkg_graph.add(pkg2,
>> atom)
>> +			# In order for the following eliminate_pkg
>> loop to produce
>> +			# deterministic results, the order of the
>> pkgs list must
>> +			# not be random (bug 631894). Prefer to
>> eliminate installed
>> +			# packages first, in case rebuilds are
>> needed, and also sort
>> +			# in ascending order so that older versions
>> are eliminated
>> +			# first.
>> +			pkgs = (sorted(pkg for pkg in pkgs if
>> pkg.installed) +
>> +				sorted(pkg for pkg in pkgs if not
>> pkg.installed)) +
>>  			for pkg in pkgs:
>>  				eliminate_pkg = True
>>  				for atom in
>> atom_pkg_graph.parent_nodes(pkg):
>
>
> Looks good
>

Thanks, merged:

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