From 339b0ac7f3b1f5e82b427a3cde6c021c406d5b71 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Wed, 21 Sep 2011 19:04:11 -0700 Subject: Make --binpkg-respect-use=y the default Explicitly stating --binpkg-respect-use=y will disable the ignored binary warning. This will fix bug #297549. --- pym/_emerge/depgraph.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b10efd62c..e8d96f4fe 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -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: -- cgit v1.2.3-1-g7c22