diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:49:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-13 03:49:51 +0000 |
| commit | 8340985f76ce62e4de796dd84f986e6484c64081 (patch) | |
| tree | 67c5b93cbaab4d34487aa6d09c0d59d84aa0d774 | |
| parent | 1cd177f8978193772add5e67d88b29262f9682a5 (diff) | |
| download | portage-8340985f76ce62e4de796dd84f986e6484c64081.tar.gz portage-8340985f76ce62e4de796dd84f986e6484c64081.tar.bz2 portage-8340985f76ce62e4de796dd84f986e6484c64081.zip | |
Don't filter/interfere with prefix variables unless they are supported by the
current EAPI. (trunk r15031)
svn path=/main/branches/2.1.7/; revision=15065
| -rwxr-xr-x | bin/ebuild.sh | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 3cd655496..a9591581d 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1657,7 +1657,18 @@ filter_readonly_variables() { SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB SANDBOX_LOG SANDBOX_ON" filtered_vars="$readonly_bash_vars $bash_misc_vars - $READONLY_PORTAGE_VARS ED EPREFIX EROOT PATH" + $READONLY_PORTAGE_VARS PATH" + + # Don't filter/interfere with prefix variables unless they are + # supported by the current EAPI. + case "${EAPI:-0}" in + 0|1|2) + ;; + *) + filtered_vars+=" ED EPREFIX EROOT" + ;; + esac + if hasq --filter-sandbox $* ; then filtered_vars="${filtered_vars} SANDBOX_.*" else |