diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-29 05:30:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-29 05:30:41 +0000 |
| commit | d724a11a0e7abfdff7e918d70207f71a0ecd92e1 (patch) | |
| tree | 41a0203916ffd243479e4eddc7170b547bd84dfa /pym | |
| parent | fa9c84cc7f9b7b042b4f1c156655c23c1417480f (diff) | |
| download | portage-d724a11a0e7abfdff7e918d70207f71a0ecd92e1.tar.gz portage-d724a11a0e7abfdff7e918d70207f71a0ecd92e1.tar.bz2 portage-d724a11a0e7abfdff7e918d70207f71a0ecd92e1.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.
svn path=/main/trunk/; revision=9592
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index aaff7e116..745ecb38c 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4704,11 +4704,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"] = "" |