Filter PORTAGE_NONFATAL from the environment where appropriate.

svn path=/main/trunk/; revision=13938

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 2bd704d7288f73616986422ac9334e19e8017c2f..bb9b9a042a0543bd8796b1e91fcef99870a5d07f 100755 (executable)
--- 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 7fc52a7776e8e94330b7a73adb1a20bd26def782..5b18fd05612cf4721f756404a7b089ae5bc1c7e1 100644 (file)
--- 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"
        ]