diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-08-23 02:02:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-23 02:02:06 +0000 |
| commit | 0e7a83b0946dc21d461a7c542267e2963354341e (patch) | |
| tree | 6baebda06aacf81ab8483ec2d9f98d83bade8d30 /bin/isolated-functions.sh | |
| parent | c47730c0f2b6c9270382357d20f4a47322ad5da5 (diff) | |
| download | portage-0e7a83b0946dc21d461a7c542267e2963354341e.tar.gz portage-0e7a83b0946dc21d461a7c542267e2963354341e.tar.bz2 portage-0e7a83b0946dc21d461a7c542267e2963354341e.zip | |
Add a new src_prepare phase function which is called in-between src_unpack
and src_configure (and bump EAPI to 2_pre3). Thanks to Ciaran McCreesh for
the suggestion.
svn path=/main/trunk/; revision=11454
Diffstat (limited to 'bin/isolated-functions.sh')
| -rwxr-xr-x | bin/isolated-functions.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index e52c9fd7c..0345bbead 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -517,7 +517,7 @@ save_ebuild_env() { if hasq --exclude-init-phases $* ; then unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_ - unset -f pkg_nofetch src_unpack src_configure \ + unset -f pkg_nofetch src_unpack src_prepare src_configure \ src_compile src_test src_install if [[ -n $PYTHONPATH ]] ; then export PYTHONPATH=${PYTHONPATH/${PORTAGE_PYM_PATH}:} @@ -543,7 +543,7 @@ save_ebuild_env() { # There's no need to bloat environment.bz2 with internally defined # functions and variables, so filter them out if possible. - for x in pkg_setup pkg_nofetch src_unpack src_configure \ + for x in pkg_setup pkg_nofetch src_unpack src_prepare src_configure \ src_compile src_test src_install pkg_preinst pkg_postinst \ pkg_prerm pkg_postrm ; do unset -f {,_}default_$x {,_}eapi{0,1,2}_$x @@ -559,8 +559,8 @@ save_ebuild_env() { keepdir unpack strip_duplicate_slashes econf einstall \ dyn_setup dyn_unpack dyn_clean into insinto exeinto docinto \ insopts diropts exeopts libopts \ - abort_handler abort_configure abort_compile \ - abort_test abort_install dyn_configure \ + abort_handler abort_prepare abort_configure abort_compile \ + abort_test abort_install dyn_prepare dyn_configure \ dyn_compile dyn_test dyn_install \ dyn_preinst dyn_help debug-print debug-print-function \ debug-print-section inherit EXPORT_FUNCTIONS newdepend newrdepend \ |