summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-02-12 09:02:37 +0000
committerZac Medico <zmedico@gentoo.org>2010-02-12 09:02:37 +0000
commitd50073eb59d027b92196de6812428203bdcfb81b (patch)
treeb7737723f00287e1e20933f5d57f5a1313ef4619
parent3b1ad6f8182b02967444e01995c0433617c59eb9 (diff)
downloadportage-d50073eb59d027b92196de6812428203bdcfb81b.tar.gz
portage-d50073eb59d027b92196de6812428203bdcfb81b.tar.bz2
portage-d50073eb59d027b92196de6812428203bdcfb81b.zip
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. svn path=/main/trunk/; revision=15344
-rw-r--r--pym/_emerge/BinpkgExtractorAsync.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtractorAsync.py
index 9e799443d..d9416643a 100644
--- 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)
-