From 2b40f5dadd81ae84c6d1df2cf0930e2e5b5ec69f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 31 May 2007 21:39:50 +0000 Subject: Make automatic "global updates" always use the config instance that's associated with /, since the rest of the code is targeted at /. (trunk r6687) svn path=/main/branches/2.1.2/; revision=6703 --- bin/emerge | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 7023f02a8..d47203427 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4225,7 +4225,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): if os.path.exists(myportdir+"/metadata/cache") and updatecache_flg: action_metadata(settings, portdb, myopts) - if portage.global_updates(settings, trees, mtimedb["updates"]): + if portage._global_updates(trees, mtimedb["updates"]): mtimedb.commit() # Reload the whole config from scratch. settings, trees, mtimedb = load_emerge_config(trees=trees) @@ -5261,7 +5261,7 @@ def emerge_main(): portage.writemsg("!!! %s\n" % str(e)) del e - if portage.global_updates(settings, trees, mtimedb["updates"]): + if portage._global_updates(trees, mtimedb["updates"]): mtimedb.commit() # Reload the whole config from scratch. settings, trees, mtimedb = load_emerge_config(trees=trees) -- cgit v1.2.3-1-g7c22