summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-26 22:19:55 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-26 22:19:55 +0000
commit54d95fda4ac3e2b5137cfcca4b0b76029206e1f5 (patch)
tree9db0f6aa47c00d719b651c1b262b4978664aa82b
parent304b7c2d14f82c9629f76117335a48e33a234dad (diff)
downloadportage-54d95fda4ac3e2b5137cfcca4b0b76029206e1f5.tar.gz
portage-54d95fda4ac3e2b5137cfcca4b0b76029206e1f5.tar.bz2
portage-54d95fda4ac3e2b5137cfcca4b0b76029206e1f5.zip
Make doebuild() use EBUILD_EXIT_STATUS_FILE sanity checks for the
extra misc-functions.sh preinst/postinst shell code. (trunk r8698) svn path=/main/branches/2.1.2/; revision=8699
-rw-r--r--pym/portage.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 21d59e4b8..a9fe9fc9f 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4280,6 +4280,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
mysettings["EBUILD_PHASE"] = ""
phase_retval = spawn(" ".join(myargs),
mysettings, debug=debug, free=1, logfile=logfile)
+ phase_retval = exit_status_check(phase_retval)
if phase_retval != os.EX_OK:
writemsg("!!! post preinst failed; exiting.\n",
noiselevel=-1)
@@ -4296,6 +4297,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
mysettings["EBUILD_PHASE"] = ""
phase_retval = spawn(" ".join(myargs),
mysettings, debug=debug, free=1, logfile=logfile)
+ phase_retval = exit_status_check(phase_retval)
if phase_retval != os.EX_OK:
writemsg("!!! post postinst failed; exiting.\n",
noiselevel=-1)