diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-06 20:57:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-06 20:57:08 +0000 |
| commit | 416c082add3ff875a4f4fc3c063b175ccca7ec7a (patch) | |
| tree | 638ae1cbb1b72ee55b6c64f5ae9c8e93de25f662 | |
| parent | 25c5202b7e66bbef5b058fd9679070877bc54ed7 (diff) | |
| download | portage-416c082add3ff875a4f4fc3c063b175ccca7ec7a.tar.gz portage-416c082add3ff875a4f4fc3c063b175ccca7ec7a.tar.bz2 portage-416c082add3ff875a4f4fc3c063b175ccca7ec7a.zip | |
Filter PORTAGE_NONFATAL from the environment where appropriate.
svn path=/main/trunk/; revision=13938
| -rwxr-xr-x | bin/isolated-functions.sh | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 2bd704d72..bb9b9a042 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -551,7 +551,7 @@ save_ebuild_env() { PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \ PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \ - PORTAGE_QUIET \ + PORTAGE_NONFATAL PORTAGE_QUIET \ PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \ PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \ PORTDIR_OVERLAY ${!PORTAGE_SANDBOX_*} PREROOTPATH \ diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 7fc52a777..5b18fd056 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1060,7 +1060,8 @@ class config(object): "A", "AA", "CATEGORY", "DEPEND", "DESCRIPTION", "EAPI", "EBUILD_PHASE", "EMERGE_FROM", "HOMEPAGE", "INHERITED", "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PF", "PKGUSE", - "PORTAGE_CONFIGROOT", "PORTAGE_IUSE", "PORTAGE_REPO_NAME", + "PORTAGE_CONFIGROOT", "PORTAGE_IUSE", + "PORTAGE_NONFATAL", "PORTAGE_REPO_NAME", "PORTAGE_USE", "PROPERTIES", "PROVIDE", "RDEPEND", "RESTRICT", "ROOT", "SLOT", "SRC_URI" ] |