diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-18 13:01:54 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-18 13:01:54 -0700 |
commit | 25c107d55ba5edc65f75ab183def32bfbb82b5ac (patch) | |
tree | c655f2a481aa5a45238a7912d25d2d3628ce2b99 | |
parent | bd2ce49c7481927ee9aea6744ce67397cc3bf8fd (diff) | |
download | portage-25c107d55ba5edc65f75ab183def32bfbb82b5ac.tar.gz portage-25c107d55ba5edc65f75ab183def32bfbb82b5ac.tar.bz2 portage-25c107d55ba5edc65f75ab183def32bfbb82b5ac.zip |
Use _prepare_env_file() to extract the binary package environment.bz2
prior to the pkg_setup phase. This fixes a regression since EbuildPhase
no longer calls doebuild(), and therefore _prepare_env_file() needs
to be called now.
-rw-r--r-- | pym/_emerge/Binpkg.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 6fdc1a6f4..4dee0925f 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from _emerge.EbuildPhase import EbuildPhase @@ -16,6 +16,7 @@ from portage import _unicode_encode import codecs import logging from portage.output import colorize +from portage.package.ebuild.doebuild import _prepare_env_file class Binpkg(CompositeTask): @@ -254,6 +255,14 @@ class Binpkg(CompositeTask): finally: f.close() + rval = _prepare_env_file(self.settings) + if rval != os.EX_OK: + self._current_phase = None + self.returncode = rval + self._unlock_builddir() + self.wait() + return + # This gives bashrc users an opportunity to do various things # such as remove binary packages after they're installed. settings = self.settings |