summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-26 09:14:25 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-26 09:14:25 +0000
commit6181fdcb4ad4dfc3d8b83c5fa2e88bac5f095f6f (patch)
treef7e7063e44a2658c9fa8e71db4dfb7b3e5c29e40
parent67adb107826300b1ae0b02cf38f1594d1b7302ab (diff)
downloadportage-6181fdcb4ad4dfc3d8b83c5fa2e88bac5f095f6f.tar.gz
portage-6181fdcb4ad4dfc3d8b83c5fa2e88bac5f095f6f.tar.bz2
portage-6181fdcb4ad4dfc3d8b83c5fa2e88bac5f095f6f.zip
Move PORTAGE_MASTER_PID and BASH_ENV from global scope to the doebuild_environment() function.
svn path=/main/trunk/; revision=3241
-rw-r--r--pym/portage.py11
1 files changed, 5 insertions, 6 deletions
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