diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-29 05:55:49 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-29 05:55:49 +0000 |
| commit | 769d85ae3d1bc0bdf206308f2dc615bd319d01b7 (patch) | |
| tree | 6210c6108f27e2b1ea52e8e44fa73181f17b45b5 /pym/portage.py | |
| parent | 0f64276849ec1abf43b975a581bbab715f90b85f (diff) | |
| download | portage-769d85ae3d1bc0bdf206308f2dc615bd319d01b7.tar.gz portage-769d85ae3d1bc0bdf206308f2dc615bd319d01b7.tar.bz2 portage-769d85ae3d1bc0bdf206308f2dc615bd319d01b7.zip | |
Bug #214619 - Run dyn_package() and preinst_mask() from ${T} instead of
${D} in order to avoid leaving gmon.out files in ${D} in case any tools
were built with -pf in CFLAGS. Also, call preinst_mask() after all other
functions so that INSTALL_MASK can be used to wipe out any gmon.out files
created during previous functions. (trunk r9592)
svn path=/main/branches/2.1.2/; revision=9595
Diffstat (limited to 'pym/portage.py')
| -rw-r--r-- | pym/portage.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index afbe04cff..2cbc2ef07 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4678,11 +4678,14 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, phase_retval = exit_status_check(phase_retval) if phase_retval == os.EX_OK: # Post phase logic and tasks that have been factored out of - # ebuild.sh. + # ebuild.sh. Call preinst_mask last so that INSTALL_MASK can + # can be used to wipe out any gmon.out files created during + # previous functions (in case any tools were built with -pg + # in CFLAGS). myargs = [_shell_quote(misc_sh_binary), - "preinst_bsdflags", "preinst_mask", + "preinst_bsdflags", "preinst_sfperms", "preinst_selinux_labels", - "preinst_suid_scan"] + "preinst_suid_scan", "preinst_mask"] _doebuild_exit_status_unlink( mysettings.get("EBUILD_EXIT_STATUS_FILE")) mysettings["EBUILD_PHASE"] = "" |