Make --binpkg-respect-use=y the default
authorSebastian Luther <SebastianLuther@gmx.de>
Thu, 22 Sep 2011 02:04:11 +0000 (19:04 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 22 Sep 2011 03:01:25 +0000 (20:01 -0700)
Explicitly stating --binpkg-respect-use=y will disable the ignored
binary warning. This will fix bug #297549.

pym/_emerge/depgraph.py

index b10efd62cc03371163eef5ef2fec6db17943e045..e8d96f4fe3df002b26d13bcecbb796990af10720 100644 (file)
@@ -551,7 +551,8 @@ class depgraph(object):
                match the user's config.
                """
                if not self._dynamic_config.ignored_binaries \
-                       or '--quiet' in self._frozen_config.myopts:
+                       or '--quiet' in self._frozen_config.myopts \
+                       or "--binpkg-respect-use" in self._frozen_config.myopts:
                        return
 
                self._show_merge_list()
@@ -569,7 +570,8 @@ class depgraph(object):
                msg = [
                        "",
                        "NOTE: The --binpkg-respect-use=n option will prevent emerge",
-                       "      from ignoring these binary packages if possible."
+                       "      from ignoring these binary packages if possible.",
+                       "      Using --binpkg-respect-use=y will silence this warning."
                ]
 
                for line in msg:
@@ -794,7 +796,7 @@ class depgraph(object):
                """Return a set of flags that trigger reinstallation, or None if there
                are no such flags."""
                if "--newuse" in self._frozen_config.myopts or \
-                       "--binpkg-respect-use" in self._frozen_config.myopts:
+                       self._frozen_config.myopts.get("--binpkg-respect-use", True) == True:
                        flags = set(orig_iuse.symmetric_difference(
                                cur_iuse).difference(forced_flags))
                        flags.update(orig_iuse.intersection(orig_use).symmetric_difference(
@@ -3965,7 +3967,7 @@ class depgraph(object):
                                        if built and not useoldpkg and (not installed or matched_pkgs_ignore_use) and \
                                                ("--newuse" in self._frozen_config.myopts or \
                                                "--reinstall" in self._frozen_config.myopts or \
-                                               "--binpkg-respect-use" in self._frozen_config.myopts):
+                                               self._frozen_config.myopts.get("--binpkg-respect-use", True) == True):
                                                iuses = pkg.iuse.all
                                                old_use = self._pkg_use_enabled(pkg)
                                                if myeb: