Use os.environ instead of the config.environ(). This solves binpkg extraction

issues with catalyst stage1 due to PATH being unset and bzip2/tar binaries
not being found by bash. (trunk r15344)

svn path=/main/branches/2.1.7/; revision=15571

diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtractorAsync.py
index 9e799443d61806c873aca6820cc36dbcaefd94e0..d9416643a2f2a81aff54cc8d1f73120f64fb6344 100644 (file)
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/pym/_emerge/BinpkgExtractorAsync.py
@@ -3,13 +3,9 @@
 # $Id$
 
 from _emerge.SpawnProcess import SpawnProcess
-try:
-       import portage
-except ImportError:
-       from os import path as osp
-       import sys
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
-       import portage
+import portage
+import os
+
 class BinpkgExtractorAsync(SpawnProcess):
 
        __slots__ = ("image_dir", "pkg", "pkg_path")
@@ -28,6 +24,5 @@ class BinpkgExtractorAsync(SpawnProcess):
                        (portage._shell_quote(self.pkg_path),
                        portage._shell_quote(self.image_dir))]
 
-               self.env = self.pkg.root_config.settings.environ()
+               self.env = os.environ.copy()
                SpawnProcess._start(self)
-