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

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

diff --git a/bin/emerge b/bin/emerge
index 72f143b07eb836b9a044d2283440d67241d4983b..cabf9e9afeccd4e9d93f394424c3204162a06baf 100755 (executable)
--- 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(":")