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 /pym | |
| 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 'pym')
| -rw-r--r-- | pym/portage.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pym/portage.py b/pym/portage.py index 16f105394..c08faf150 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -8123,12 +8123,10 @@ def portageexit(): atexit_register(portageexit) -def global_updates(mysettings, trees, prev_mtimes): +def _global_updates(trees, prev_mtimes): """ Perform new global updates if they exist in $PORTDIR/profiles/updates/. - @param mysettings: A config instance for ROOT="/". - @type mysettings: config @param trees: A dictionary containing portage trees. @type trees: dict @param prev_mtimes: A dictionary containing mtimes of files located in @@ -8142,6 +8140,7 @@ def global_updates(mysettings, trees, prev_mtimes): global secpass if secpass < 2 or "SANDBOX_ACTIVE" in os.environ: return + mysettings = trees["/"]["vartree"].settings updpath = os.path.join(mysettings["PORTDIR"], "profiles", "updates") try: |