[gentoo-portage-dev] [PATCH] _dep_check_composite_db._visible: verify that highest_visible matches (bug 567686)

[gentoo-portage-dev] [PATCH] _dep_check_composite_db._visible: verify that highest_visible matches (bug 567686)

[Zac Medico]

If the highest visible match for a package slot does not match the
required atom, then do not mask other packages in the same slot.
Bug 567686 was triggered when the highest visible match for the
package slot did not match the subslot specified by the required atom.

X-Gentoo-Bug: 567686
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=567686
---
 pym/_emerge/depgraph.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 2169b00..fd2c771 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -9064,7 +9064,9 @@ class _dep_check_composite_db(dbapi):
 			# Note: highest_visible is not necessarily the real highest
 			# visible, especially when --update is not enabled, so use
 			# < operator instead of !=.
-			if highest_visible is not None and pkg < highest_visible:
+			if (highest_visible is not None and pkg < highest_visible
+				and atom_set.findAtomForPackage(highest_visible,
+				modified_use=self._depgraph._pkg_use_enabled(highest_visible))):
 				return False
 		elif in_graph != pkg:
 			# Mask choices for packages that would trigger a slot
-- 
2.4.10

[gentoo-portage-dev] Re: [PATCH] _dep_check_composite_db._visible: verify that highest_visible matches (bug 567686)

[Zac Medico]

On 12/12/2015 10:48 PM, Zac Medico wrote:
> If the highest visible match for a package slot does not match the
> required atom, then do not mask other packages in the same slot.
> Bug 567686 was triggered when the highest visible match for the
> package slot did not match the subslot specified by the required atom.
> 
> X-Gentoo-Bug: 567686
> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=567686
> ---
>  pym/_emerge/depgraph.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
> index 2169b00..fd2c771 100644
> --- a/pym/_emerge/depgraph.py
> +++ b/pym/_emerge/depgraph.py
> @@ -9064,7 +9064,9 @@ class _dep_check_composite_db(dbapi):
>  			# Note: highest_visible is not necessarily the real highest
>  			# visible, especially when --update is not enabled, so use
>  			# < operator instead of !=.
> -			if highest_visible is not None and pkg < highest_visible:
> +			if (highest_visible is not None and pkg < highest_visible
> +				and atom_set.findAtomForPackage(highest_visible,
> +				modified_use=self._depgraph._pkg_use_enabled(highest_visible))):
>  				return False
>  		elif in_graph != pkg:
>  			# Mask choices for packages that would trigger a slot
> 

This is pretty trivial, so I've pushed it.
-- 
Thanks,
Zac