| 1 |
commit: 7cbd04cd62c8f13ed41e07ff8bc9b7e5d5ac700b |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 13 06:44:52 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 13 23:37:47 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7cbd04cd |
| 7 |
|
| 8 |
_dep_check_composite_db._visible: verify that highest_visible matches (bug 567686) |
| 9 |
|
| 10 |
If the highest visible match for a package slot does not match the |
| 11 |
required atom, then do not mask other packages in the same slot. |
| 12 |
Bug 567686 was triggered when the highest visible match for the |
| 13 |
package slot did not match the subslot specified by the required atom. |
| 14 |
|
| 15 |
X-Gentoo-Bug: 567686 |
| 16 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=567686 |
| 17 |
Reported-by: Dennis Schridde <devurandom <AT> gmx.net> |
| 18 |
Tested-by: Dennis Schridde <devurandom <AT> gmx.net> |
| 19 |
|
| 20 |
pym/_emerge/depgraph.py | 4 +++- |
| 21 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 24 |
index 2169b00..fd2c771 100644 |
| 25 |
--- a/pym/_emerge/depgraph.py |
| 26 |
+++ b/pym/_emerge/depgraph.py |
| 27 |
@@ -9064,7 +9064,9 @@ class _dep_check_composite_db(dbapi): |
| 28 |
# Note: highest_visible is not necessarily the real highest |
| 29 |
# visible, especially when --update is not enabled, so use |
| 30 |
# < operator instead of !=. |
| 31 |
- if highest_visible is not None and pkg < highest_visible: |
| 32 |
+ if (highest_visible is not None and pkg < highest_visible |
| 33 |
+ and atom_set.findAtomForPackage(highest_visible, |
| 34 |
+ modified_use=self._depgraph._pkg_use_enabled(highest_visible))): |
| 35 |
return False |
| 36 |
elif in_graph != pkg: |
| 37 |
# Mask choices for packages that would trigger a slot |
Archives