From ccd76785a011416de3b5362b6d65910e4761e617 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 5 Jul 2006 04:29:09 +0000 Subject: [PATCH] Run global updates asap and then reload the whole config to make sure everything is consistent. svn path=/main/trunk/; revision=3788 --- bin/emerge | 9 ++++++--- 1 file 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 -- 2.26.2