summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-27 08:20:58 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-27 08:20:58 +0000
commitd0e0c760c50a3c25fe43a600e5f142cbc0150bb6 (patch)
tree88329959934fd2cad4e14ef0b16e8352368f830c
parent0c89454e0fbdbf6b0945eaf0f7540810dae7c1fe (diff)
downloadportage-d0e0c760c50a3c25fe43a600e5f142cbc0150bb6.tar.gz
portage-d0e0c760c50a3c25fe43a600e5f142cbc0150bb6.tar.bz2
portage-d0e0c760c50a3c25fe43a600e5f142cbc0150bb6.zip
Don't forget to unlink ${EBUILD_EXIT_STATUS_FILE} before each phase.
svn path=/main/trunk/; revision=8706
-rw-r--r--pym/portage/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c66a1ab33..b6b0e0c0e 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4325,6 +4325,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)
@@ -4342,6 +4344,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)