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 1RD3NM-00054P-9d for garchives@archives.gentoo.org; Mon, 10 Oct 2011 00:05:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 294E7E04F2; Mon, 10 Oct 2011 00:05:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E88C5E04F2 for ; Mon, 10 Oct 2011 00:05:40 +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 8393E1B4017 for ; Mon, 10 Oct 2011 00:05:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 86E2D80042 for ; Mon, 10 Oct 2011 00:05:39 +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: <6622bb5b63b49b1e528d89fee061e40b2d0d5afd.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: 6622bb5b63b49b1e528d89fee061e40b2d0d5afd Date: Mon, 10 Oct 2011 00:05:39 +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: 44b363057faf9eb3b132e199a9978478 commit: 6622bb5b63b49b1e528d89fee061e40b2d0d5afd Author: Zac Medico gentoo org> AuthorDate: Mon Oct 10 00:05:23 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 10 00:05:23 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D6622bb5b show_ignored_binaries: filter noise, bug #386379 --- pym/_emerge/depgraph.py | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 66cba04..a409bed 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -556,6 +556,32 @@ class depgraph(object): "binpkg_respect_use") in ("y", "n"): return =20 + for pkg in list(self._dynamic_config.ignored_binaries): + + selected_pkg =3D self._dynamic_config.mydbapi[pkg.root + ].match_pkgs(pkg.slot_atom) + + if not selected_pkg: + continue + + selected_pkg =3D selected_pkg[-1] + if selected_pkg > pkg: + self._dynamic_config.ignored_binaries.pop(pkg) + continue + + if selected_pkg.installed and \ + selected_pkg.cpv =3D=3D pkg.cpv and \ + selected_pkg.metadata.get('BUILD_TIME') =3D=3D \ + pkg.metadata.get('BUILD_TIME'): + # We don't care about ignored binaries when an + # identical installed instance is selected to + # fill the slot. + self._dynamic_config.ignored_binaries.pop(pkg) + continue + + if not self._dynamic_config.ignored_binaries: + return + self._show_merge_list() =20 writemsg("\n!!! The following binary packages have been ignored " + \