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 1RlO0L-00033Z-3v for garchives@archives.gentoo.org; Thu, 12 Jan 2012 16:59:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F499E0477; Thu, 12 Jan 2012 16:59:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 32519E0477 for ; Thu, 12 Jan 2012 16:59:49 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A96B31B4059 for ; Thu, 12 Jan 2012 16:59:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 217CB80044 for ; Thu, 12 Jan 2012 16:59:48 +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: <5438bb29c996d777b6343515995176912a7c137f.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: 5438bb29c996d777b6343515995176912a7c137f Date: Thu, 12 Jan 2012 16:59:48 +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: 3d014a25-5d70-43f5-9994-ece545c620e6 X-Archives-Hash: 4a7cad6c3ef5adf696de357f72c8b7cd commit: 5438bb29c996d777b6343515995176912a7c137f Author: Zac Medico gentoo org> AuthorDate: Thu Jan 12 16:59:40 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jan 12 16:59:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5438bb29 depgraph: account for unevaluated_atom in cache --- pym/_emerge/depgraph.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 19daa4e..0c9e5f2 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3450,7 +3450,7 @@ class depgraph(object): yield pkg =20 def _select_pkg_highest_available(self, root, atom, onlydeps=3DFalse): - cache_key =3D (root, atom, onlydeps) + cache_key =3D (root, atom, atom.unevaluated_atom, onlydeps) ret =3D self._dynamic_config._highest_pkg_cache.get(cache_key) if ret is not None: pkg, existing =3D ret