diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-31 21:39:50 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-31 21:39:50 +0000 |
| commit | 2b40f5dadd81ae84c6d1df2cf0930e2e5b5ec69f (patch) | |
| tree | b7ca512518c4ca882967042cd83a084432b04b23 /bin | |
| parent | f7b35dad6c95951afb369eb3a4bbb49a9f5574a8 (diff) | |
| download | portage-2b40f5dadd81ae84c6d1df2cf0930e2e5b5ec69f.tar.gz portage-2b40f5dadd81ae84c6d1df2cf0930e2e5b5ec69f.tar.bz2 portage-2b40f5dadd81ae84c6d1df2cf0930e2e5b5ec69f.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/emerge | 4 | ||||
| -rwxr-xr-x | bin/fixpackages | 2 |
2 files changed, 3 insertions, 3 deletions
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) diff --git a/bin/fixpackages b/bin/fixpackages index 388a9ad44..39b813662 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -24,7 +24,7 @@ except (OSError, ValueError), e: portage.writemsg("!!! %s\n" % str(e)) del e -portage.global_updates(mysettings, mytrees, mtimedb["updates"]) +portage._global_updates(mytrees, mtimedb["updates"]) print print "Done." |