diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-17 19:59:23 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-17 19:59:23 -0700 |
| commit | 1d9b8968460c4bdb44daeda3454ef0ef5035c398 (patch) | |
| tree | 49f266dd59a7509eae43b18889c61d7a5c1c5a86 /bin/phase-functions.sh | |
| parent | 8bdba93c1a5d3b7500dec73a12fa9c40b43b9e2a (diff) | |
| download | portage-1d9b8968460c4bdb44daeda3454ef0ef5035c398.tar.gz portage-1d9b8968460c4bdb44daeda3454ef0ef5035c398.tar.bz2 portage-1d9b8968460c4bdb44daeda3454ef0ef5035c398.zip | |
doebuild: update environment.bz2 for pre/postinstv2.2.0_alpha129
Also, remove unnecessary __dyn_preinst func.
Diffstat (limited to 'bin/phase-functions.sh')
| -rw-r--r-- | bin/phase-functions.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 7048419ff..92e25c65f 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -601,14 +601,6 @@ __dyn_install() { trap - SIGINT SIGQUIT } -__dyn_preinst() { - if [ -z "${D}" ]; then - eerror "${FUNCNAME}: D is unset" - return 1 - fi - __ebuild_phase_with_hooks pkg_preinst -} - __dyn_help() { echo echo "Portage" @@ -871,7 +863,7 @@ __ebuild_main() { nofetch) __ebuild_phase_with_hooks pkg_nofetch ;; - prerm|postrm|postinst|config|info) + prerm|postrm|preinst|postinst|config|info) if has "${1}" config info && \ ! declare -F "pkg_${1}" >/dev/null ; then ewarn "pkg_${1}() is not defined: '${EBUILD##*/}'" @@ -884,7 +876,7 @@ __ebuild_main() { __ebuild_phase_with_hooks pkg_${1} set +x fi - if [[ $EBUILD_PHASE == postinst ]] && [[ -n $PORTAGE_UPDATE_ENV ]]; then + if [[ -n $PORTAGE_UPDATE_ENV ]] ; then # Update environment.bz2 in case installation phases # need to pass some variables to uninstallation phases. __save_ebuild_env --exclude-init-phases | \ @@ -960,7 +952,7 @@ __ebuild_main() { fi export SANDBOX_ON="0" ;; - help|pretend|setup|preinst) + help|pretend|setup) #pkg_setup needs to be out of the sandbox for tmp file creation; #for example, awking and piping a file in /tmp requires a temp file to be created #in /etc. If pkg_setup is in the sandbox, both our lilo and apache ebuilds break. |