1 |
If the highest visible match for a package slot does not match the |
2 |
required atom, then do not mask other packages in the same slot. |
3 |
Bug 567686 was triggered when the highest visible match for the |
4 |
package slot did not match the subslot specified by the required atom. |
5 |
|
6 |
X-Gentoo-Bug: 567686 |
7 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=567686 |
8 |
--- |
9 |
pym/_emerge/depgraph.py | 4 +++- |
10 |
1 file changed, 3 insertions(+), 1 deletion(-) |
11 |
|
12 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
13 |
index 2169b00..fd2c771 100644 |
14 |
--- a/pym/_emerge/depgraph.py |
15 |
+++ b/pym/_emerge/depgraph.py |
16 |
@@ -9064,7 +9064,9 @@ class _dep_check_composite_db(dbapi): |
17 |
# Note: highest_visible is not necessarily the real highest |
18 |
# visible, especially when --update is not enabled, so use |
19 |
# < operator instead of !=. |
20 |
- if highest_visible is not None and pkg < highest_visible: |
21 |
+ if (highest_visible is not None and pkg < highest_visible |
22 |
+ and atom_set.findAtomForPackage(highest_visible, |
23 |
+ modified_use=self._depgraph._pkg_use_enabled(highest_visible))): |
24 |
return False |
25 |
elif in_graph != pkg: |
26 |
# Mask choices for packages that would trigger a slot |
27 |
-- |
28 |
2.4.10 |