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 1RASYO-00089s-Du for garchives@archives.gentoo.org; Sun, 02 Oct 2011 20:22:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7845D21C073; Sun, 2 Oct 2011 20:22:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4575F21C073 for ; Sun, 2 Oct 2011 20:22:19 +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 889281B4008 for ; Sun, 2 Oct 2011 20:22:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9972C80042 for ; Sun, 2 Oct 2011 20:22: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: <77b651300731ec007cd535a83b8ee9a898602783.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: 77b651300731ec007cd535a83b8ee9a898602783 Date: Sun, 2 Oct 2011 20:22: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: X-Archives-Hash: 1067e586062490f4183044dff42386d8 commit: 77b651300731ec007cd535a83b8ee9a898602783 Author: Zac Medico gentoo org> AuthorDate: Sun Oct 2 20:22:07 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 2 20:22:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D77b65130 Prefer slot conflict over blocker display. The slot conflict display has better noise reduction than the unsatisfied blockers display, so skip unsatisfied blockers display if there are slot conflicts (see bug #385391). Note that this reverses the logic from bug 159310, since the slot conflict display has evolved a lot since then. --- pym/_emerge/depgraph.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index ad04551..66cba04 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -6170,13 +6170,14 @@ class depgraph(object): self._show_circular_deps( self._dynamic_config._circular_deps_for_display) =20 - # The user is only notified of a slot conflict if - # there are no unresolvable blocker conflicts. - if self._dynamic_config._unsatisfied_blockers_for_display is not None: + # The slot conflict display has better noise reduction than + # the unsatisfied blockers display, so skip unsatisfied blockers + # display if there are slot conflicts (see bug #385391). + if self._dynamic_config._slot_collision_info: + self._show_slot_collision_notice() + elif self._dynamic_config._unsatisfied_blockers_for_display is not Non= e: self._show_unsatisfied_blockers( self._dynamic_config._unsatisfied_blockers_for_display) - elif self._dynamic_config._slot_collision_info: - self._show_slot_collision_notice() else: self._show_missed_update() =20