From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 46BD41381F3 for ; Mon, 2 Sep 2013 00:28:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26A59E0980; Mon, 2 Sep 2013 00:28:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADA0BE0FEF for ; Mon, 2 Sep 2013 00:27:59 +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 C17E633EB20 for ; Mon, 2 Sep 2013 00:27:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6CAE9E468F for ; Mon, 2 Sep 2013 00:27:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1378081655.8e39ac038b29a358aa1bf9cf4eaeb2987f1eacec.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/FakeVartree.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8e39ac038b29a358aa1bf9cf4eaeb2987f1eacec X-VCS-Branch: master Date: Mon, 2 Sep 2013 00:27:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3900bd40-3647-44a8-8b86-5c3e8a2154a1 X-Archives-Hash: 542e4b3fe35d3d124a19aeaa7c8be84c commit: 8e39ac038b29a358aa1bf9cf4eaeb2987f1eacec Author: Zac Medico gentoo org> AuthorDate: Mon Sep 2 00:27:35 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 2 00:27:35 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8e39ac03 FakeVartree: infinite _aux_get_wrapper recursion --- pym/_emerge/FakeVartree.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index fd87f6c..14be50c 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -166,8 +166,13 @@ class FakeVartree(vartree): if self._global_updates is None: self._global_updates = \ grab_global_updates(self._portdb) + + # Bypass _aux_get_wrapper, since calling that + # here would trigger infinite recursion. + aux_keys = Package._dep_keys + self.dbapi._pkg_str_aux_keys + aux_dict = dict(zip(aux_keys, self._aux_get(pkg.cpv, aux_keys))) perform_global_updates( - pkg.cpv, self.dbapi, self._global_updates) + pkg.cpv, aux_dict, self.dbapi, self._global_updates) def dynamic_deps_preload(self, pkg, metadata): if metadata is not None: @@ -300,9 +305,7 @@ def grab_global_updates(portdb): return retupdates -def perform_global_updates(mycpv, mydb, myupdates): - aux_keys = Package._dep_keys + mydb._pkg_str_aux_keys - aux_dict = dict(zip(aux_keys, mydb.aux_get(mycpv, aux_keys))) +def perform_global_updates(mycpv, aux_dict, mydb, myupdates): try: pkg = _pkg_str(mycpv, metadata=aux_dict, settings=mydb.settings) except InvalidData: