diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-06 23:29:03 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-06 23:29:03 +0000 |
| commit | c1fd20e5bd5138196e2c58eb1c0b6895bf1bf6af (patch) | |
| tree | d414ba2cc1099efd049d83987b506db4be9bcc0e /bin/ebuild.sh | |
| parent | 31311b48a10293e8ce9a9f37a4f0aaeae1101d81 (diff) | |
| download | portage-c1fd20e5bd5138196e2c58eb1c0b6895bf1bf6af.tar.gz portage-c1fd20e5bd5138196e2c58eb1c0b6895bf1bf6af.tar.bz2 portage-c1fd20e5bd5138196e2c58eb1c0b6895bf1bf6af.zip | |
Prevent the filter_opts local variable from leaking into the
environment in preprocess_ebuild_env(). (trunk r8857)
svn path=/main/branches/2.1.2/; revision=8858
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 5fcf27794..c40403264 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1442,7 +1442,8 @@ preprocess_ebuild_env() { filter_opts="--filter-sandbox ${filter_opts}" fi filter_readonly_variables ${filter_opts} < "${T}"/environment \ - > "${T}"/environment.filtered + > "${T}"/environment.filtered || return $? + unset filter_opts mv "${T}"/environment.filtered "${T}"/environment || return $? rm -f "${T}/environment.success" || return $? # WARNING: Code inside this subshell should avoid making assumptions |