* 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.

svn path=/main/trunk/; revision=10804

diff --git a/bin/portageq b/bin/portageq
index fe5260bc0ce0a21c30b32771812c9b7826fa4832..04e65c8e73d6fecd9d1f91b7c575957ac4d17fcc 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -462,23 +462,15 @@ def main():
 
        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)