Tweak auto --binpkg-respect-use more.

We don't want to check for --rebuilt-binaries here, unless --usepkg
is also enabled. In fact, we can skip the --rebuilt-binaries check
since people who really want to ensure that binary packages are used
as much as possible will typically specify --usepkgonly (or
--getbinpkgonly which implies --usepkgonly).

diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py
index d94ad89b324325a96eb617de81834e93023fe8d0..42983fef3f23fe13c5d7c5588a66d6b8c0bfb370 100644 (file)
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -67,8 +67,7 @@ def create_depgraph_params(myopts, myaction):
        binpkg_respect_use = myopts.get('--binpkg-respect-use')
        if binpkg_respect_use is not None:
                myparams['binpkg_respect_use'] = binpkg_respect_use
-       elif '--usepkgonly' not in myopts and \
-               myopts.get('--rebuilt-binaries') is not True:
+       elif '--usepkgonly' not in myopts:
                # If --binpkg-respect-use is not explicitly specified, we enable
                # the behavior automatically (like requested in bug #297549), as
                # long as it doesn't strongly conflict with other options that