When the post preinst shell tasks fail, write a message to stderr and return it's...
authorZac Medico <zmedico@gentoo.org>
Thu, 23 Mar 2006 02:18:27 +0000 (02:18 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 23 Mar 2006 02:18:27 +0000 (02:18 -0000)
svn path=/main/trunk/; revision=2974

pym/portage.py

index 9a3896031b516e3456d16f17b430d26c72c59890..b4f05f75dd3dbdf0d8d87040729889f16faf1a4c 100644 (file)
@@ -2737,7 +2737,9 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea
                        # Post phase logic and tasks that have been factored out of ebuild.sh.
                        myargs = [MISC_SH_BINARY, "preinst_mask", "preinst_sfperms",
                                "preinst_selinux_labels", "preinst_suid_scan"]
-                       spawn(" ".join(myargs), mysettings, debug=debug, free=1, logfile=logfile)
+                       phase_retval = spawn(" ".join(myargs), mysettings, debug=debug, free=1, logfile=logfile)
+                       if phase_retval != os.EX_OK:
+                               writemsg("!!! post preinst failed; exiting.\n")
                del mysettings["IMAGE"]
                return phase_retval
        elif mydo in ["prerm","postrm","postinst","config"]: