diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-10 22:51:56 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-10 22:51:56 -0800 |
| commit | c1edb7a9bb5162b0781cfbebd475a65562aa6dd7 (patch) | |
| tree | cc156344b40e07ce1b22a6991843148761c548c3 /bin | |
| parent | da0831b24be79e008939f8507f9d457367e533ee (diff) | |
| download | portage-c1edb7a9bb5162b0781cfbebd475a65562aa6dd7.tar.gz portage-c1edb7a9bb5162b0781cfbebd475a65562aa6dd7.tar.bz2 portage-c1edb7a9bb5162b0781cfbebd475a65562aa6dd7.zip | |
Remove _SANDBOX_COMPAT_LEVEL.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 9 | ||||
| -rw-r--r-- | bin/phase-functions.sh | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 1f95adb82..af7b3a92b 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -40,15 +40,6 @@ else unset x fi -if [[ $PORTAGE_SANDBOX_COMPAT_LEVEL -lt 22 ]] ; then - # Ensure that /dev/std* streams have appropriate sandbox permission for - # bug #288863. This can be removed after sandbox is fixed and portage - # depends on the fixed version (sandbox-2.2 has the fix but it is - # currently unstable). - export SANDBOX_WRITE="${SANDBOX_WRITE:+${SANDBOX_WRITE}:}/dev/stdout:/dev/stderr" - export SANDBOX_READ="${SANDBOX_READ:+${SANDBOX_READ}:}/dev/stdin" -fi - # Don't use sandbox's BASH_ENV for new shells because it does # 'source /etc/profile' which can interfere with the build # environment by modifying our PATH. diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index f862b30fe..bd8708c73 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -23,7 +23,7 @@ PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \ PORTAGE_IPC_DAEMON PORTAGE_IUSE PORTAGE_LOG_FILE \ PORTAGE_MUTABLE_FILTERED_VARS PORTAGE_PYM_PATH PORTAGE_PYTHON \ PORTAGE_READONLY_METADATA PORTAGE_READONLY_VARS \ - PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_SANDBOX_COMPAT_LEVEL \ + PORTAGE_REPO_NAME PORTAGE_RESTRICT \ PORTAGE_SAVED_READONLY_VARS PORTAGE_SIGPIPE_STATUS \ PORTAGE_TMPDIR PORTAGE_UPDATE_ENV PORTAGE_USERNAME \ PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR PORTDIR_OVERLAY \ |