Make sure EBUILD_PHASE is properly unset when calling misc-functions.sh.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index d9d762860ae14b1bb6b54f536176b6ec1b5c1af6..411f0a16ef7e70e961bb5dc01413f2b0bdfe2620 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2202,6 +2202,7 @@ class MiscFunctionsProcess(SpawnProcess):
 
        def _start(self):
                settings = self.settings
+               settings.pop("EBUILD_PHASE", None)
                portage_bin_path = settings["PORTAGE_BIN_PATH"]
                misc_sh_binary = os.path.join(portage_bin_path,
                        os.path.basename(portage.const.MISC_SH_BINARY))

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index bbfdd7d103b224230dd9873268c6599fef971b4a..42124708fb840588cd871caa126fdd976d1452d7 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -5527,6 +5527,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                        if phase_retval == os.EX_OK:
                                _doebuild_exit_status_unlink(
                                        mysettings.get("EBUILD_EXIT_STATUS_FILE"))
+                               mysettings.pop("EBUILD_PHASE", None)
                                phase_retval = spawn(
                                        " ".join(_post_pkg_preinst_cmd(mysettings)),
                                        mysettings, debug=debug, free=1, logfile=logfile)
@@ -5548,6 +5549,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                        if phase_retval == os.EX_OK:
                                _doebuild_exit_status_unlink(
                                        mysettings.get("EBUILD_EXIT_STATUS_FILE"))
+                               mysettings.pop("EBUILD_PHASE", None)
                                phase_retval = spawn(" ".join(_post_pkg_postinst_cmd(mysettings)),
                                        mysettings, debug=debug, free=1, logfile=logfile)
                                phase_retval = exit_status_check(phase_retval)