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 1SfzbF-0002fg-9e for garchives@archives.gentoo.org; Sat, 16 Jun 2012 20:28:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3F42E079C; Sat, 16 Jun 2012 20:27:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B085EE079C for ; Sat, 16 Jun 2012 20:27:48 +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 23E831B401F for ; Sat, 16 Jun 2012 20:27:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E0B73E5431 for ; Sat, 16 Jun 2012 20:27:46 +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: <1339878450.d3d4787ae25dc166f63cfabab97c4b8d70bf67ac.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: d3d4787ae25dc166f63cfabab97c4b8d70bf67ac X-VCS-Branch: master Date: Sat, 16 Jun 2012 20:27:46 +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: df2b6313-b2db-437e-934f-7d4c9989acba X-Archives-Hash: 7e752ec9c881e4a0ff455e6d6a9258c0 commit: d3d4787ae25dc166f63cfabab97c4b8d70bf67ac Author: Zac Medico gentoo org> AuthorDate: Sat Jun 16 20:27:30 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jun 16 20:27:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd3d4787a depgraph: simplify _select_pkg_highest_available This hunk of code is no longer needed since the content of _highest_pkg_cache is discarded each time a package is added to the graph. --- pym/_emerge/depgraph.py | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 83c17ac..276a749 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -3468,14 +3468,6 @@ class depgraph(object): cache_key =3D (root, atom, atom.unevaluated_atom, onlydeps, self._dyna= mic_config._autounmask) ret =3D self._dynamic_config._highest_pkg_cache.get(cache_key) if ret is not None: - pkg, existing =3D ret - if pkg and not existing: - existing =3D self._dynamic_config._slot_pkg_map[root].get(pkg.slot_a= tom) - if existing and existing =3D=3D pkg: - # Update the cache to reflect that the - # package has been added to the graph. - ret =3D pkg, pkg - self._dynamic_config._highest_pkg_cache[cache_key] =3D ret return ret ret =3D self._select_pkg_highest_available_imp(root, atom, onlydeps=3D= onlydeps) self._dynamic_config._highest_pkg_cache[cache_key] =3D ret