From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R6aVK-0008EP-Kq for garchives@archives.gentoo.org; Thu, 22 Sep 2011 04:03:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F153E21C024 for ; Thu, 22 Sep 2011 04:03:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 26D0021C138 for ; Thu, 22 Sep 2011 03:06:20 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF03B1B400F for ; Thu, 22 Sep 2011 03:06:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0D4A78003C for ; Thu, 22 Sep 2011 03:06:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <339b0ac7f3b1f5e82b427a3cde6c021c406d5b71.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/depgraph.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 339b0ac7f3b1f5e82b427a3cde6c021c406d5b71 Date: Thu, 22 Sep 2011 03:06:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e9fe5d093089343c9723b5bf8042ed44 commit: 339b0ac7f3b1f5e82b427a3cde6c021c406d5b71 Author: Sebastian Luther gmx de> AuthorDate: Thu Sep 22 02:04:11 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 22 03:01:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D339b0ac7 Make --binpkg-respect-use=3Dy the default Explicitly stating --binpkg-respect-use=3Dy will disable the ignored binary warning. This will fix bug #297549. --- pym/_emerge/depgraph.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b10efd6..e8d96f4 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 =20 self._show_merge_list() @@ -569,7 +570,8 @@ class depgraph(object): msg =3D [ "", "NOTE: The --binpkg-respect-use=3Dn option will prevent emerge", - " from ignoring these binary packages if possible." + " from ignoring these binary packages if possible.", + " Using --binpkg-respect-use=3Dy will silence this warning." ] =20 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) =3D=3D T= rue: flags =3D 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_ignor= e_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) =3D=3D= True): iuses =3D pkg.iuse.all old_use =3D self._pkg_use_enabled(pkg) if myeb: