diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-12-06 11:02:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-06 11:02:11 +0000 |
| commit | d4647f465ec5e090cf31259cb6b51937fdd176a4 (patch) | |
| tree | 58be14e5632511b8f999dc6e9553983e0928efa2 | |
| parent | Add a AbstractEbuildProcess class for MiscFunctionsProcess to inherit the (diff) | |
| download | portage-d4647f465ec5e090cf31259cb6b51937fdd176a4.tar.gz portage-d4647f465ec5e090cf31259cb6b51937fdd176a4.tar.bz2 portage-d4647f465ec5e090cf31259cb6b51937fdd176a4.zip | |
Fix _spawn_misc_sh() to properly unset EBUILD_PHASE, and add a 'phase'
description parameter for use in messages. (trunk r14934)
svn path=/main/branches/2.1.7/; revision=14948
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index d169ab114..2f5d43f85 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5697,7 +5697,8 @@ def _post_phase_userpriv_perms(mysettings): def _post_src_install_checks(mysettings): _post_src_install_uid_fix(mysettings) global _post_phase_cmds - retval = _spawn_misc_sh(mysettings, _post_phase_cmds["install"]) + retval = _spawn_misc_sh(mysettings, _post_phase_cmds["install"], + phase='internal_post_src_install') if retval != os.EX_OK: writemsg(_("!!! install_qa_check failed; exiting.\n"), noiselevel=-1) @@ -6002,7 +6003,7 @@ def _post_pkg_postinst_cmd(mysettings): return myargs -def _spawn_misc_sh(mysettings, commands, **kwargs): +def _spawn_misc_sh(mysettings, commands, phase=None, **kwargs): """ @param mysettings: the ebuild config @type mysettings: config @@ -6022,14 +6023,14 @@ def _spawn_misc_sh(mysettings, commands, **kwargs): mysettings.get("EBUILD_EXIT_STATUS_FILE")) debug = mysettings.get("PORTAGE_DEBUG") == "1" logfile = mysettings.get("PORTAGE_LOG_FILE") - mydo = mysettings["EBUILD_PHASE"] + mysettings.pop("EBUILD_PHASE", None) try: rval = spawn(mycommand, mysettings, debug=debug, logfile=logfile, **kwargs) finally: pass - msg = _doebuild_exit_status_check(mydo, mysettings) + msg = _doebuild_exit_status_check(phase, mysettings) if msg: if rval == os.EX_OK: rval = 1 |