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 1ShpcJ-0000bC-R1 for garchives@archives.gentoo.org; Thu, 21 Jun 2012 22:12:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E572BE0CDC; Thu, 21 Jun 2012 22:06:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F1ADC21C10F for ; Thu, 21 Jun 2012 21:58:19 +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 6C9591B4034 for ; Thu, 21 Jun 2012 21:58:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2D8D2E5435 for ; Thu, 21 Jun 2012 21:58:17 +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: <1340315882.3767f627d221cfab990482fef5b2336e9e2dbcf5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3767f627d221cfab990482fef5b2336e9e2dbcf5 X-VCS-Branch: master Date: Thu, 21 Jun 2012 21:58:17 +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: acbfe089-3f97-4dcf-962c-06533c5d169f X-Archives-Hash: 9e10411244d9497c3e12d6f1c8c1d715 commit: 3767f627d221cfab990482fef5b2336e9e2dbcf5 Author: Zac Medico gentoo org> AuthorDate: Thu Jun 21 21:58:02 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jun 21 21:58:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3767f627 action_build: always display_problems --- pym/_emerge/actions.py | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index eaf5a15..aaaf261 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -172,6 +172,7 @@ def action_build(settings, trees, mtimedb, verbose =3D "--verbose" in myopts quiet =3D "--quiet" in myopts myparams =3D create_depgraph_params(myopts, myaction) + mergelist_shown =3D False =20 if pretend or fetchonly: # make the mtimedb readonly @@ -319,6 +320,7 @@ def action_build(settings, trees, mtimedb, mydepgraph.altlist(reversed=3Dtree), favorites=3Dfavorites) mydepgraph.display_problems() + mergelist_shown =3D True if retval !=3D os.EX_OK: return retval prompt=3D"Would you like to resume merging these packages?" @@ -327,6 +329,7 @@ def action_build(settings, trees, mtimedb, mydepgraph.altlist(reversed=3D("--tree" in myopts)), favorites=3Dfavorites) mydepgraph.display_problems() + mergelist_shown =3D True if retval !=3D os.EX_OK: return retval mergecount=3D0 @@ -383,6 +386,7 @@ def action_build(settings, trees, mtimedb, mydepgraph.altlist(reversed=3Dtree), favorites=3Dfavorites) mydepgraph.display_problems() + mergelist_shown =3D True if retval !=3D os.EX_OK: return retval else: @@ -390,6 +394,7 @@ def action_build(settings, trees, mtimedb, mydepgraph.altlist(reversed=3D("--tree" in myopts)), favorites=3Dfavorites) mydepgraph.display_problems() + mergelist_shown =3D True if retval !=3D os.EX_OK: return retval if "--buildpkgonly" in myopts: @@ -420,6 +425,11 @@ def action_build(settings, trees, mtimedb, print("!!! Cannot merge requested packages. Merge deps and try again= .\n") return 1 =20 + if not mergelist_shown: + # If we haven't already shown the merge list above, at + # least show warnings about missed updates an such. + mydepgraph.display_problems() + if ("--resume" in myopts): favorites=3Dmtimedb["resume"]["favorites"] =20