From 7e10d7603d3dae51997928e41a6de2b03e18344c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 17 Sep 2010 21:18:39 -0700 Subject: Remove unused PORTAGE_MASTER_PID variable. --- bin/isolated-functions.sh | 2 +- pym/portage/package/ebuild/_config/special_env_vars.py | 2 +- pym/portage/package/ebuild/doebuild.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 3e6d15901..081e3b9ee 100644 --- 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 2b42e74b1..52b8b3a29 100644 --- 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 044d66590..f874806a7 100644 --- 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 -- cgit v1.2.3-1-g7c22