From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 26 Apr 2006 09:14:25 +0000 (-0000)
Subject: Move PORTAGE_MASTER_PID and BASH_ENV from global scope to the doebuild_environment... 
X-Git-Tag: v2.1_pre10~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6181fdcb4ad4dfc3d8b83c5fa2e88bac5f095f6f;p=portage.git

Move PORTAGE_MASTER_PID and BASH_ENV from global scope to the doebuild_environment() function.

svn path=/main/trunk/; revision=3241
---

diff --git a/pym/portage.py b/pym/portage.py
index 5e59dd4f8..1f4269086 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2316,6 +2316,11 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
 	mysettings["EBUILD_PHASE"] = mydo
 	mysettings["SLOT"] = slot
 
+	mysettings["PORTAGE_MASTER_PID"] = str(os.getpid())
+
+	# We are disabling user-specific bashrc files.
+	mysettings["BASH_ENV"] = INVALID_ENV_FILE
+
 	if debug: # Otherwise it overrides emerge's settings.
 		# We have no other way to set debug... debug can't be passed in
 		# due to how it's coded... Don't overwrite this so we can use it.
@@ -6794,12 +6799,6 @@ except portage_exception.DirectoryNotFound, e:
 
 root = settings["ROOT"]
 
-# useful info
-settings["PORTAGE_MASTER_PID"]=str(os.getpid())
-settings.backup_changes("PORTAGE_MASTER_PID")
-# We are disabling user-specific bashrc files.
-settings["BASH_ENV"] = INVALID_ENV_FILE
-settings.backup_changes("BASH_ENV")
 usedefaults = settings.use_defs # DEPRECATED (no longer used)
 do_vartree(settings)
 settings.reset() # XXX: Regenerate use after we get a vartree -- GLOBAL