From ecefd74bdbe0ca305e05e35d9ed673738420e9f0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Dec 2007 23:09:09 +0000 Subject: 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 --- bin/portageq | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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")) -- cgit v1.2.3-1-g7c22