diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-08 23:02:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-08 23:02:45 +0000 |
| commit | e0838f94ba133bf6c514f84fe606f1b15956f6f9 (patch) | |
| tree | 7a405436843e3a3035878c86ba7a80eec2e92843 | |
| parent | 05a05746897be73b9df75f0950532c4bd24e840b (diff) | |
| download | portage-e0838f94ba133bf6c514f84fe606f1b15956f6f9.tar.gz portage-e0838f94ba133bf6c514f84fe606f1b15956f6f9.tar.bz2 portage-e0838f94ba133bf6c514f84fe606f1b15956f6f9.zip | |
Do an EBUILD_EXIT_STATUS_FILE sanity check in spawnebuild()
where it spawns misc-functions.sh after the install phase.
(trunk r8874)
svn path=/main/branches/2.1.2/; revision=8875
| -rw-r--r-- | pym/portage.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index fad76b650..4ce2e7f50 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -3716,6 +3716,8 @@ def spawnebuild(mydo,actionmap,mysettings,debug,alwaysdep=0,logfile=None): os.path.basename(MISC_SH_BINARY)) mycommand = " ".join([_shell_quote(misc_sh_binary), "install_qa_check", "install_symlink_html_docs"]) + _doebuild_exit_status_unlink( + mysettings.get("EBUILD_EXIT_STATUS_FILE")) filter_calling_env_state = mysettings._filter_calling_env if os.path.exists(os.path.join(mysettings["T"], "environment")): mysettings._filter_calling_env = True @@ -3724,7 +3726,14 @@ def spawnebuild(mydo,actionmap,mysettings,debug,alwaysdep=0,logfile=None): logfile=logfile, **kwargs) finally: mysettings._filter_calling_env = filter_calling_env_state - if qa_retval: + msg = _doebuild_exit_status_check(mydo, mysettings) + if msg: + qa_retval = 1 + from textwrap import wrap + mysettings["EBUILD_PHASE"] = mydo + _eerror(mysettings, wrap(msg, 72)) + mysettings["EBUILD_PHASE"] = "" + if qa_retval != os.EX_OK: writemsg("!!! install_qa_check failed; exiting.\n", noiselevel=-1) return qa_retval |