Remove _SANDBOX_COMPAT_LEVEL.

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1f95adb8215f5d469a6ea10939488c3deb87ff8c..af7b3a92bf55e9cb6fec911849d43af02a68a410 100755 (executable)
--- 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 f862b30feb1550c9e2f3274c6fb9e2f9d55efc68..bd8708c73813842f6fcf65f54eb16088859c4824 100644 (file)
--- 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 \

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 37abb1650dee0b793152c94f4211b9f5205a959d..77c68eb0dbe65496e348118ed0b80cebae94a836 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -165,7 +165,6 @@ _ENABLE_PRESERVE_LIBS   = True
 _ENABLE_REPO_NAME_WARN  = True
 _ENABLE_SET_CONFIG      = True
 _ENABLE_XATTR           = True
-_SANDBOX_COMPAT_LEVEL   = "22"
 
 
 # The definitions above will differ between branches, so it's useful to have

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 3911e97730a546f5881c93dec7e66f239949e809..fd0bf2d62f3a93f6b0f116e7528cd8093098f291 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -20,7 +20,7 @@ env_blacklist = frozenset((
        "PDEPEND", "PF", "PKGUSE", "PORTAGE_BACKGROUND",
        "PORTAGE_BACKGROUND_UNMERGE", "PORTAGE_BUILDIR_LOCKED",
        "PORTAGE_BUILT_USE", "PORTAGE_CONFIGROOT", "PORTAGE_IUSE",
-       "PORTAGE_NONFATAL", "PORTAGE_REPO_NAME", "PORTAGE_SANDBOX_COMPAT_LEVEL",
+       "PORTAGE_NONFATAL", "PORTAGE_REPO_NAME",
        "PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "RESTRICT",
        "ROOT", "SLOT", "SRC_URI"
 ))
@@ -59,7 +59,7 @@ environ_whitelist += [
        "PORTAGE_LOG_FILE",
        "PORTAGE_PYM_PATH", "PORTAGE_PYTHON", "PORTAGE_QUIET",
        "PORTAGE_REPO_NAME", "PORTAGE_RESTRICT",
-       "PORTAGE_SANDBOX_COMPAT_LEVEL", "PORTAGE_SIGPIPE_STATUS",
+       "PORTAGE_SIGPIPE_STATUS",
        "PORTAGE_TMPDIR", "PORTAGE_UPDATE_ENV", "PORTAGE_USERNAME",
        "PORTAGE_VERBOSE", "PORTAGE_WORKDIR_MODE",
        "PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PROFILE_PATHS",

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 21af0de7682e286495ba3287675490bee0586a2a..9a8486c39b851966d449e328e60b4de84b1c53ef 100644 (file)
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -27,7 +27,6 @@ from portage.const import CACHE_PATH, \
        MODULES_FILE_PATH, \
        PRIVATE_PATH, PROFILE_PATH, USER_CONFIG_PATH, \
        USER_VIRTUALS_FILE
-from portage.const import _SANDBOX_COMPAT_LEVEL
 from portage.dbapi import dbapi
 from portage.dbapi.porttree import portdbapi
 from portage.dbapi.vartree import vartree
@@ -512,9 +511,6 @@ class config(object):
                        self["EROOT"] = eroot
                        self.backup_changes("EROOT")
 
-                       self["PORTAGE_SANDBOX_COMPAT_LEVEL"] = _SANDBOX_COMPAT_LEVEL
-                       self.backup_changes("PORTAGE_SANDBOX_COMPAT_LEVEL")
-
                        self._ppropertiesdict = portage.dep.ExtendedAtomDict(dict)
                        self._penvdict = portage.dep.ExtendedAtomDict(dict)