From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 11 Dec 2007 23:09:09 +0000 (-0000)
Subject: First import the main portage module without legacy globals since it
X-Git-Tag: v2.2_pre1~203
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ecefd74bdbe0ca305e05e35d9ed673738420e9f0;p=portage.git

First import the main portage module without legacy globals since it
is almost certain to succeed in that case. This provides access to
the portage.exception namespace which is needed for later exception
handling, like if portage.exception.PermissionDenied is raised when
constructing the legacy global config instance.

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

diff --git a/bin/portageq b/bin/portageq
index eb0421e8b..0b7eab6fe 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -434,10 +434,19 @@ def main():
 			sys.stderr.flush()
 			sys.exit(os.EX_USAGE)
 		os.environ["ROOT"] = sys.argv[2]
+
+	# First import the main portage module without legacy globals since it
+	# is almost certain to succeed in that case. This provides access to
+	# the portage.exception namespace which is needed for later exception
+	# handling, like if portage.exception.PermissionDenied is raised when
+	# constructing the legacy global config instance.
+	os.environ["PORTAGE_LEGACY_GLOBALS"] = "false"
+	import portage
+	del os.environ["PORTAGE_LEGACY_GLOBALS"]
 	try:
 		global portage
 		try:
-			import portage
+			reload(portage)
 		except ImportError:
 			from os import path as osp
 			sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))