From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 1 Feb 2007 20:16:06 +0000 (-0000)
Subject: Load the most current variables from /etc/profile.env for post_emerge stuff. (trunk... 
X-Git-Tag: v2.1.2-r6~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=edff9628d2334a1e77e07876eda17297052dcf99;p=portage.git

Load the most current variables from /etc/profile.env for post_emerge stuff. (trunk 5857:5858)

svn path=/main/branches/2.1.2/; revision=5868
---

diff --git a/bin/emerge b/bin/emerge
index 72f143b07..cabf9e9af 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3515,6 +3515,12 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 def post_emerge(settings, mtimedb, retval):
 	target_root = settings["ROOT"]
 	info_mtimes = mtimedb["info"]
+
+	# Load the most current variables from ${ROOT}/etc/profile.env
+	settings.unlock()
+	settings.regenerate()
+	settings.lock()
+
 	config_protect = settings.get("CONFIG_PROTECT","").split()
 	infodirs = settings.get("INFOPATH","").split(":") + \
 		settings.get("INFODIR","").split(":")