From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 5 Jul 2006 04:29:09 +0000 (-0000)
Subject: Run global updates asap and then reload the whole config to make sure everything... 
X-Git-Tag: v2.1.1~282
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ccd76785a011416de3b5362b6d65910e4761e617;p=portage.git

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

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

diff --git a/bin/emerge b/bin/emerge
index f0895592e..9716c0cb2 100755
--- 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