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 AD978198005 for ; Tue, 19 Mar 2013 20:10:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F764E035C; Tue, 19 Mar 2013 20:10:44 +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 D01B9E035C for ; Tue, 19 Mar 2013 20:10:43 +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 AD06C33DA23 for ; Tue, 19 Mar 2013 20:10:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 44EDFE4073 for ; Tue, 19 Mar 2013 20:10:41 +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: <1363723828.273b785644b859b9f54600ec572641a308cf7292.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 273b785644b859b9f54600ec572641a308cf7292 X-VCS-Branch: master Date: Tue, 19 Mar 2013 20:10:41 +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: d399b53d-82b4-4b45-a47e-2e70a21abe1a X-Archives-Hash: 62ce8b3de42a04e9025b00096b3e6203 commit: 273b785644b859b9f54600ec572641a308cf7292 Author: Zac Medico gentoo org> AuthorDate: Tue Mar 19 20:10:28 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 19 20:10:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=273b7856 config: make circular vartree import lazy --- pym/portage/dbapi/vartree.py | 3 +-- pym/portage/package/ebuild/config.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 77220bb..9bc6e89 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3597,11 +3597,10 @@ class dblink(object): slot_matches.append(self.mycpv) others_in_slot = [] - from portage import config for cur_cpv in slot_matches: # Clone the config in case one of these has to be unmerged since # we need it to have private ${T} etc... for things like elog. - settings_clone = config(clone=self.settings) + settings_clone = portage.config(clone=self.settings) settings_clone.pop("PORTAGE_BUILDDIR_LOCKED", None) settings_clone.reset() others_in_slot.append(dblink(self.cat, catsplit(cur_cpv)[1], diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 2ac59f0..5f3e1c6 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -21,6 +21,7 @@ from _emerge.Package import Package import portage portage.proxy.lazyimport.lazyimport(globals(), 'portage.data:portage_gid', + 'portage.dbapi.vartree:vartree', 'portage.package.ebuild.doebuild:_phase_func_map', ) from portage import bsd_chflags, \ @@ -32,7 +33,6 @@ from portage.const import CACHE_PATH, \ USER_VIRTUALS_FILE from portage.dbapi import dbapi from portage.dbapi.porttree import portdbapi -from portage.dbapi.vartree import vartree from portage.dep import Atom, isvalidatom, match_from_list, use_reduce, _repo_separator, _slot_separator from portage.eapi import eapi_exports_AA, eapi_exports_merge_type, \ eapi_supports_prefix, eapi_exports_replace_vars, _get_eapi_attrs