summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-05 04:29:09 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-05 04:29:09 +0000
commitccd76785a011416de3b5362b6d65910e4761e617 (patch)
tree6f5e7e49e13128f0fc71f8b4d29f90ee9b763dad
parent918cc3a99d3197c496b28dd7335203193c16c8df (diff)
downloadportage-ccd76785a011416de3b5362b6d65910e4761e617.tar.gz
portage-ccd76785a011416de3b5362b6d65910e4761e617.tar.bz2
portage-ccd76785a011416de3b5362b6d65910e4761e617.zip
Run global updates asap and then reload the whole config to make sure everything is consistent.
svn path=/main/trunk/; revision=3788
-rwxr-xr-xbin/emerge9
1 files changed, 6 insertions, 3 deletions
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