Fix emerge --usepkg to use a binary package when the corresponding
ebuild is not available (and --use-ebuild-visibility is not enabled),
in cases when no other package is available to satisfy the dependency.
This reverts an unintended behavior change from commit
e309323f156528a8a79a1f755e1326e8880346b7.
Fixes: e309323f1565 ("emerge: fix --use-ebuild-visibility to reject binary
packages (bug 612960)")
X-Gentoo-bug: 613360
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=613360
---
pym/_emerge/depgraph.py | 5 +++--
.../resolver/test_binary_pkg_ebuild_visibility.py | 26 ++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 543f4dc..b1dae25 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -6072,8 +6072,9 @@ class depgraph(object):
if not
use_ebuild_visibility and (usepkgonly or useoldpkg):
if
pkg.installed and pkg.masks:
continue
- elif not
self._equiv_ebuild_visible(pkg,
-
autounmask_level=autounmask_level):
+ elif
((use_ebuild_visibility or matched_packages)
+ and not
self._equiv_ebuild_visible(pkg,
+
autounmask_level=autounmask_level)):
continue
# Calculation of USE for unbuilt
ebuilds is relatively
diff --git a/pym/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
b/pym/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
index ea65abd..0d01d06 100644
--- a/pym/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
+++ b/pym/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
@@ -104,6 +104,32 @@ class BinaryPkgEbuildVisibilityTestCase(TestCase):
'[binary]app-misc/foo-3',
],
),
+
+ # The default behavior is to enforce ebuild visibility
as
+ # long as a visible package is available to satisfy the
+ # current atom. In the following test case, ebuild
visibility
+ # is ignored in order to satisfy the =app-misc/foo-3
atom.
+ ResolverPlaygroundTestCase(
+ ["=app-misc/foo-3"],
+ options = {
+ "--usepkg": True,
+ },
+ success = True,
+ mergelist = [
+ '[binary]app-misc/foo-3',
+ ],
+ ),
+
+ # Verify that --use-ebuild-visibility works with
--usepkg
+ # when no other visible package is available.
+ ResolverPlaygroundTestCase(
+ ["=app-misc/foo-3"],
+ options = {
+ "--use-ebuild-visibility": "y",
+ "--usepkg": True,
+ },
+ success = False,
+ ),
)
playground = ResolverPlayground(binpkgs=binpkgs,
ebuilds=ebuilds,
--
2.10.2
