Don't forget to unlink ${EBUILD_EXIT_STATUS_FILE} before each phase.

(trunk r8706)

svn path=/main/branches/2.1.2/; revision=8707

diff --git a/pym/portage.py b/pym/portage.py
index 9e5b1bed54aa7e1a80095496445b9b1210013022..9c748aa8be97911c3a43c9432e093c655a376343 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4284,6 +4284,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                                myargs = [MISC_SH_BINARY, "preinst_bsdflags", "preinst_mask",
                                        "preinst_sfperms", "preinst_selinux_labels",
                                        "preinst_suid_scan"]
+                               _doebuild_exit_status_unlink(
+                                       mysettings.get("EBUILD_EXIT_STATUS_FILE"))
                                mysettings["EBUILD_PHASE"] = ""
                                phase_retval = spawn(" ".join(myargs),
                                        mysettings, debug=debug, free=1, logfile=logfile)
@@ -4301,6 +4303,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                                # Post phase logic and tasks that have been factored out of
                                # ebuild.sh.
                                myargs = [MISC_SH_BINARY, "postinst_bsdflags"]
+                               _doebuild_exit_status_unlink(
+                                       mysettings.get("EBUILD_EXIT_STATUS_FILE"))
                                mysettings["EBUILD_PHASE"] = ""
                                phase_retval = spawn(" ".join(myargs),
                                        mysettings, debug=debug, free=1, logfile=logfile)