[gentoo-portage-dev] Re: [PATCH] _slot_confict_backtrack: minimize conflict atoms (bug 743631)

[Zac Medico <zmedico@gentoo.org>]

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

On 9/19/20 2:40 PM, Zac Medico wrote:
> diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
> index 3f864aefc..40e7d1325 100644
> --- a/lib/_emerge/depgraph.py
> +++ b/lib/_emerge/depgraph.py
> @@ -1797,6 +1797,12 @@ class depgraph:
>  				if parent_atom not in parent_atoms)
>  			backtrack_data.append((to_be_masked, conflict_atoms))
>  
> +		# Prefer choices that minimize conflict atoms. This is intended
> +		# to take precedence over the earlier package version sort. The
> +		# package version sort is still needed or else the
> +		# testOverlapSlotConflict method of VirtualMinimizeChildrenTestCase
> +		# will not succeed reliably with the default backtrack limit.

Updated this comment to indicate that the package version sort sort is actually
needed for deterministic results:

		# Prefer choices that minimize conflict atoms. This is intended
		# to take precedence over the earlier package version sort. The
		# package version sort is still needed or else choices for the
		# testOverlapSlotConflict method of VirtualMinimizeChildrenTestCase
		# become non-deterministic.

-- 
Thanks,
Zac


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