summaryrefslogtreecommitdiffstats
path: root/pym/emerge/__init__.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-05-31 05:43:41 +0000
committerZac Medico <zmedico@gentoo.org>2007-05-31 05:43:41 +0000
commitf50684e83a2a3ef71556e276d03534a5d9bbb500 (patch)
tree7956f8e336b43b7ffbccde40781000907f2d7fa9 /pym/emerge/__init__.py
parentba32174f699657690d4a710e4de84fe7ce16c6aa (diff)
downloadportage-f50684e83a2a3ef71556e276d03534a5d9bbb500.tar.gz
portage-f50684e83a2a3ef71556e276d03534a5d9bbb500.tar.bz2
portage-f50684e83a2a3ef71556e276d03534a5d9bbb500.zip
Make automatic "global updates" always use the config instance that's associated with /, since the rest of the code is targeted at /.
svn path=/main/trunk/; revision=6687
Diffstat (limited to 'pym/emerge/__init__.py')
-rw-r--r--pym/emerge/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 5189c6e2d..c653104a9 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4338,7 +4338,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)
@@ -5384,7 +5384,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)