Re: [PATCH] _slot_confict_backtrack: minimize conflict atoms (bug 743631)

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQKTBAEBCgB9FiEE8OgXaltWzqgSupCu0HX7jBBKPSAFAl9mhM1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEYw
RTgxNzZBNUI1NkNFQTgxMkJBOTBBRUQwNzVGQjhDMTA0QTNEMjAACgkQ0HX7jBBK
PSDSTRAAk04AikZEnXaVtQumV1hejLSy84X2ZhbB2VfNS/dNx/seO+a9nb4vYdWd
Nv+iql9KHus5W9vWBDNXzVkrGsXjSCeg7UwcY5dUnvzXhJuRzmMoXY/24ZSL4fSu
dmBeKB+w5R7kBeVlClIz4kZAgieQcYp8Y6VFfAoE6i/5/RJgcoaWkgUCH4jIT1YS
vt+UaHvwpovYhTBGsyuX44iYAUcPwifkxMicS7pc6nl3k1+l0SPxtZxjKgqLPvxJ
czd7M+LtZjPwYlq+0Mn3bDJ/KvyvMpuoZnEef+Hwst0IwzKEF4z8y3FgGNNWiC4D
JZDYBz6SvNuNPJKFUl6Qea+60cLR0rY3jd2JPgbuowWbipko+XNVJHA6VGnDb4Oj
YdfWpFV7vO87+DHdszzGPKp7UjdUYmWFrVj2IzJk0NWZ6a6Q6ecm0M18z1grrO/w
5ld3apsYYXeso1Gvmx8Htn3AtuLrgtXy5PYFrbb+vj6+U1B/siMtGM3+dEHqdCNO
5xpR8hpREhvjDlHrXGw5gJvLVngmEQFydR0TAUHghyD6EmxixQGwPAg3EfVK6Kku
FyQ7MRzPFqFY1xa4ikFeCeEBiDNWm/KrnAeBYryDfuWWq8H+w8R7Xlz4bsTWQxXK
rhZV7a5N9/n2uLzi6ZzaIhwFU0HgV50BZN4ismtOC4Of7G6uw44=
=6JPA
-----END PGP SIGNATURE-----