1 |
On 9/19/20 2:40 PM, Zac Medico wrote: |
2 |
> diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
3 |
> index 3f864aefc..40e7d1325 100644 |
4 |
> --- a/lib/_emerge/depgraph.py |
5 |
> +++ b/lib/_emerge/depgraph.py |
6 |
> @@ -1797,6 +1797,12 @@ class depgraph: |
7 |
> if parent_atom not in parent_atoms) |
8 |
> backtrack_data.append((to_be_masked, conflict_atoms)) |
9 |
> |
10 |
> + # Prefer choices that minimize conflict atoms. This is intended |
11 |
> + # to take precedence over the earlier package version sort. The |
12 |
> + # package version sort is still needed or else the |
13 |
> + # testOverlapSlotConflict method of VirtualMinimizeChildrenTestCase |
14 |
> + # will not succeed reliably with the default backtrack limit. |
15 |
|
16 |
Updated this comment to indicate that the package version sort sort is actually |
17 |
needed for deterministic results: |
18 |
|
19 |
# Prefer choices that minimize conflict atoms. This is intended |
20 |
# to take precedence over the earlier package version sort. The |
21 |
# package version sort is still needed or else choices for the |
22 |
# testOverlapSlotConflict method of VirtualMinimizeChildrenTestCase |
23 |
# become non-deterministic. |
24 |
|
25 |
-- |
26 |
Thanks, |
27 |
Zac |