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 1SSBM9-00023b-Qy for garchives@archives.gentoo.org; Wed, 09 May 2012 18:11:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4447FE08DA; Wed, 9 May 2012 18:11:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 139E7E08DA for ; Wed, 9 May 2012 18:11:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77D3E1B4044 for ; Wed, 9 May 2012 18:11:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 40958E542D for ; Wed, 9 May 2012 18:11:12 +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: <1336587056.92b45cbc29b3375a96c404f3ff46bcf389e85943.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: 92b45cbc29b3375a96c404f3ff46bcf389e85943 X-VCS-Branch: master Date: Wed, 9 May 2012 18:11:12 +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: 2bdd8e86-714a-43b0-b599-00731201b6d7 X-Archives-Hash: 9c76c21a2d8bd421ef83a67fd7b21210 commit: 92b45cbc29b3375a96c404f3ff46bcf389e85943 Author: Zac Medico gentoo org> AuthorDate: Wed May 9 18:10:56 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 9 18:10:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D92b45cbc Show unsatisfied REQUIRED_USE for bug #415125. --- pym/_emerge/depgraph.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index dfc9be9..2df29f7 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1117,7 +1117,8 @@ class depgraph(object): if atom is None: atom =3D Atom("=3D" + pkg.cpv) self._dynamic_config._unsatisfied_deps_for_display.append( - ((pkg.root, atom), {"myparent":dep.parent})) + ((pkg.root, atom), + {"myparent" : dep.parent, "show_req_use" : pkg})) self._dynamic_config._skip_restart =3D True return 0 =20 @@ -2928,7 +2929,7 @@ class depgraph(object): =20 =20 def _show_unsatisfied_dep(self, root, atom, myparent=3DNone, arg=3DNone= , - check_backtrack=3DFalse, check_autounmask_breakage=3DFalse): + check_backtrack=3DFalse, check_autounmask_breakage=3DFalse, show_req_u= se=3DNone): """ When check_backtrack=3DTrue, no output is produced and the method either returns or raises _backtrack_mask if @@ -3209,12 +3210,16 @@ class depgraph(object): =20 mask_docs =3D False =20 - if required_use_unsatisfied: + if show_req_use is None and required_use_unsatisfied: # We have an unmasked package that only requires USE adjustment # in order to satisfy REQUIRED_USE, and nothing more. We assume # that the user wants the latest version, so only the first # instance is displayed. - pkg =3D required_use_unsatisfied[0] + show_req_use =3D required_use_unsatisfied[0] + + if show_req_use is not None: + + pkg =3D show_req_use output_cpv =3D pkg.cpv + _repo_separator + pkg.repo writemsg_stdout("\n!!! " + \ colorize("BAD", "The ebuild selected to satisfy ") + \