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 1R959w-0000ya-CZ for garchives@archives.gentoo.org; Thu, 29 Sep 2011 01:11:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10A2A21C146; Thu, 29 Sep 2011 01:11:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D57F521C146 for ; Thu, 29 Sep 2011 01:11:11 +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 649001B401D for ; Thu, 29 Sep 2011 01:11:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C238680042 for ; Thu, 29 Sep 2011 01:11:10 +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: 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: abcf9f8b8fcc7daacafc8284a580436d94e1668f Date: Thu, 29 Sep 2011 01:11:10 +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: 2ae512d2eaf9f69559d77c939516c955 commit: abcf9f8b8fcc7daacafc8284a580436d94e1668f Author: Zac Medico gentoo org> AuthorDate: Thu Sep 29 01:10:06 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 29 01:10:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dabcf9f8b depgraph: verify "missed updates" Since the change involving slot conflict parent atoms in commit 6cea2091526659521d35be6c8dc7733f69f1a760, we want to check to make sure we don't display any false positives in the "missed updates". --- pym/_emerge/depgraph.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index f9f4954..b58b76f 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -591,6 +591,10 @@ class depgraph(object): # Exclude installed here since we only # want to show available updates. continue + chosen_pkg, existing_node =3D \ + self._select_package(pkg.root, pkg.slot_atom) + if chosen_pkg >=3D pkg: + continue k =3D (pkg.root, pkg.slot_atom) if k in missed_updates: other_pkg, mask_type, parent_atoms =3D missed_updates[k]