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 1QzHYt-0001J9-RF for garchives@archives.gentoo.org; Fri, 02 Sep 2011 00:24:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88BCB21C031; Fri, 2 Sep 2011 00:24:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 515AD21C031 for ; Fri, 2 Sep 2011 00:24:36 +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 A93E81B402A for ; Fri, 2 Sep 2011 00:24:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 579BA80042 for ; Fri, 2 Sep 2011 00:24:34 +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: <9bcba040300459fab19778925727ccfc72f55e3d.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: 9bcba040300459fab19778925727ccfc72f55e3d Date: Fri, 2 Sep 2011 00:24:34 +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: bbc516877ea8e26fcd933d10e160419b commit: 9bcba040300459fab19778925727ccfc72f55e3d Author: Zac Medico gentoo org> AuthorDate: Fri Sep 2 00:24:03 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Sep 2 00:24:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D9bcba040 Show merge list before "missed update" messages. --- pym/_emerge/depgraph.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e1c39bc..de7bd4a 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -585,6 +585,7 @@ class depgraph(object): if not missed_updates: return =20 + self._show_merge_list() backtrack_masked =3D [] =20 for pkg, parent_atoms in missed_updates: @@ -627,6 +628,7 @@ class depgraph(object): if not missed_updates: return =20 + self._show_merge_list() msg =3D [] msg.append("\nWARNING: One or more updates have been " + \ "skipped due to a dependency conflict:\n\n")