From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 23 Jun 2007 23:03:17 +0000 (-0000)
Subject: Fix check_config_instance() weirdness when the ebuild command reloads the portage... 
X-Git-Tag: v2.2_pre1~1171
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c7c4aeb927d4ffc1c1f69cdf5220d64aad2a8ff;p=portage.git

Fix check_config_instance() weirdness when the ebuild command reloads the portage module.

svn path=/main/trunk/; revision=6982
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 56c711d13..1fe162bff 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -19,7 +19,7 @@ from portage.versions import pkgsplit, catpkgsplit, best
 import portage.gpg, portage.checksum
 
 from portage import eclass_cache, auxdbkeys, auxdbkeylen, doebuild, flatten, \
-	listdir, dep_expand, eapi_is_supported, key_expand, dep_check, config
+	listdir, dep_expand, eapi_is_supported, key_expand, dep_check
 
 import os, stat, sys
 
@@ -31,6 +31,7 @@ class portdbapi(dbapi):
 	def __init__(self, porttree_root, mysettings=None):
 		portdbapi.portdbapi_instances.append(self)
 
+		from portage import config
 		if mysettings:
 			self.mysettings = mysettings
 		else: