Remove unused PORTAGE_MASTER_PID variable.

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 3e6d15901681f235b8903abbc1e159c7c1582e50..081e3b9ee99e8937419f3d3f4c63c8a216423d7c 100644 (file)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -601,7 +601,7 @@ save_ebuild_env() {
                        PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \
                        PORTAGE_GRPNAME PORTAGE_INST_GID \
                        PORTAGE_INST_UID PORTAGE_IPC_DAEMON \
-                       PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
+                       PORTAGE_LOG_FILE \
                        PORTAGE_NONFATAL PORTAGE_QUIET PORTAGE_PYTHON \
                        PORTAGE_REPO_NAME PORTAGE_RESTRICT \
                        PORTAGE_SANDBOX_COMPAT_LEVEL PORTAGE_SIGPIPE_STATUS \

diff --git a/pym/portage/package/ebuild/_config/special_env_vars.py b/pym/portage/package/ebuild/_config/special_env_vars.py
index 2b42e74b1d13bbf538e5889cfad5a77555d2c01e..52b8b3a295dbbb8176f1dd79529b68431f44bc04 100644 (file)
--- a/pym/portage/package/ebuild/_config/special_env_vars.py
+++ b/pym/portage/package/ebuild/_config/special_env_vars.py
@@ -50,7 +50,7 @@ environ_whitelist += [
        "PORTAGE_GID", "PORTAGE_GRPNAME",
        "PORTAGE_INST_GID", "PORTAGE_INST_UID",
        "PORTAGE_IPC_DAEMON", "PORTAGE_IUSE",
-       "PORTAGE_LOG_FILE", "PORTAGE_MASTER_PID",
+       "PORTAGE_LOG_FILE",
        "PORTAGE_PYM_PATH", "PORTAGE_PYTHON", "PORTAGE_QUIET",
        "PORTAGE_REPO_NAME", "PORTAGE_RESTRICT",
        "PORTAGE_SANDBOX_COMPAT_LEVEL", "PORTAGE_SIGPIPE_STATUS",

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 044d66590575cbdd35736a3649641669fe9eb6df..f874806a74608af059e6cea849351340d32b4d42 100644 (file)
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -173,8 +173,6 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None,
        mysettings.pop("EBUILD_PHASE", None) # remove from backupenv
        mysettings["EBUILD_PHASE"] = mydo
 
-       mysettings["PORTAGE_MASTER_PID"] = str(os.getpid())
-
        # Set requested Python interpreter for Portage helpers.
        mysettings['PORTAGE_PYTHON'] = portage._python_interpreter