[gentoo-commits] portage r10804 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-06-26 19:28:29 +0000 (Thu, 26 Jun 2008)
New Revision: 10804

Modified:
   main/trunk/bin/portageq
Log:
* Remove PORTAGE_LEGACY_GLOBALS hack for portage import since late
  initialization of portage.settings (via ObjectProxy) allows us
  to rely on being able to access the portage.exception namespace
  before portage.settings is initialized.

* Use portage.settings["ROOT"] instead of portage.root to avoid
  potential ObjectProxy compatibility issues.


Modified: main/trunk/bin/portageq
===================================================================
--- main/trunk/bin/portageq	2008-06-26 18:49:14 UTC (rev 10803)
+++ main/trunk/bin/portageq	2008-06-26 19:28:29 UTC (rev 10804)
@@ -462,23 +462,15 @@
 
 	global portage
 
-	# 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:
 		try:
-			reload(portage)
+			import portage
 		except ImportError:
 			from os import path as osp
 			sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
 			import portage
 		if uses_root:
-			sys.argv[2] = portage.root
+			sys.argv[2] = portage.settings["ROOT"]
 		retval = function(sys.argv[2:])
 		if retval:
 			sys.exit(retval)

-- 
gentoo-commits@l.g.o mailing list