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 /pym/portage | |
| parent | da0831b24be79e008939f8507f9d457367e533ee (diff) | |
| download | portage-c1edb7a9bb5162b0781cfbebd475a65562aa6dd7.tar.gz portage-c1edb7a9bb5162b0781cfbebd475a65562aa6dd7.tar.bz2 portage-c1edb7a9bb5162b0781cfbebd475a65562aa6dd7.zip | |
Remove _SANDBOX_COMPAT_LEVEL.
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/const.py | 1 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_config/special_env_vars.py | 4 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/pym/portage/const.py b/pym/portage/const.py index 37abb1650..77c68eb0d 100644 --- 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 3911e9773..fd0bf2d62 100644 --- 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 21af0de76..9a8486c39 100644 --- 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) |