Run global updates asap and then reload the whole config to make sure everything...

svn path=/main/trunk/; revision=3788

diff --git a/bin/emerge b/bin/emerge
index f0895592e615832a43ef36e4f18cb12a3ab69dd3..9716c0cb2b65d92fbd7160fc56c401e8384398f4 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3543,6 +3543,12 @@ def emerge_main():
        os.umask(022)
        settings, trees, mtimedb = load_emerge_config()
        portdb = trees[settings["ROOT"]]["porttree"].dbapi
+       portage.global_updates(settings, trees, mtimedb["updates"])
+       mtimedb.commit()
+       # Reload the whole config from scratch.
+       settings, trees, mtimedb = load_emerge_config(trees=trees)
+       portdb = trees[settings["ROOT"]]["porttree"].dbapi
+
        ldpath_mtimes = mtimedb["ldpath"]
        xterm_titles = "notitles" not in settings.features
 
@@ -3602,9 +3608,6 @@ def emerge_main():
        myaction, myopts, myfiles = parse_opts(tmpcmdline)
        edebug = 0
 
-       portage.global_updates(settings, trees, mtimedb["updates"])
-       mtimedb.commit()
-
        spinner = stdout_spinner()
        if "candy" in settings.features:
                spinner.update = spinner.update_scroll