diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-12-10 01:02:01 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-12-10 01:02:01 +0000 |
commit | a6de04e2e0daa4c2697ecb9d11f6adaf8bbf63f2 (patch) | |
tree | ad0477526b6e30b54052d10d405f556c5c883e94 /bin/isolated-functions.sh | |
parent | 780f07a62b0d873757085593f0a40225507aa0b7 (diff) | |
download | portage-a6de04e2e0daa4c2697ecb9d11f6adaf8bbf63f2.tar.gz portage-a6de04e2e0daa4c2697ecb9d11f6adaf8bbf63f2.tar.bz2 portage-a6de04e2e0daa4c2697ecb9d11f6adaf8bbf63f2.zip |
Bump EAPI conditionals to account for rename of EAPI 3 to 4. Thanks to
Jonathan Callen <abcd@g.o> for this patch. (trunk r14965)
svn path=/main/branches/2.1.7/; revision=14999
Diffstat (limited to 'bin/isolated-functions.sh')
-rwxr-xr-x | bin/isolated-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 9741419b6..a557d9fd9 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -54,7 +54,7 @@ dump_trace() { } nonfatal() { - if has "${EAPI:-0}" 0 1 2; then + if has "${EAPI:-0}" 0 1 2 3; then die "$FUNCNAME() not supported in this EAPI" fi if [[ $# -lt 1 ]]; then @@ -515,7 +515,7 @@ save_ebuild_env() { 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 + unset -f default_$x _eapi{0,1,2,3,4}_$x done unset x |