diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-10 23:49:40 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-10 23:49:40 -0800 |
| commit | d67d11c82338a6d9ee073eab18bd0e24cd846c77 (patch) | |
| tree | 0a94c079db76f8749eff3c1550220b837ba02da5 | |
| parent | 975fccbf19e5208e5b64f97980b4d7a6b91e4e28 (diff) | |
| download | portage-d67d11c82338a6d9ee073eab18bd0e24cd846c77.tar.gz portage-d67d11c82338a6d9ee073eab18bd0e24cd846c77.tar.bz2 portage-d67d11c82338a6d9ee073eab18bd0e24cd846c77.zip | |
load_emerge_config: change order of code back
A couple of recent commits touched this function, and code got moved
around unnecessarily.
| -rw-r--r-- | pym/_emerge/actions.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 484f6b09b..b3d0b1268 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2987,18 +2987,17 @@ def load_emerge_config(trees=None): kwargs[k] = v trees = portage.create_trees(trees=trees, **kwargs) - settings = trees[trees._target_eroot]['vartree'].settings - mtimedbfile = os.path.join(settings['EROOT'], portage.CACHE_PATH, "mtimedb") - mtimedb = portage.MtimeDB(mtimedbfile) - QueryCommand._db = trees - for root, root_trees in trees.items(): settings = root_trees["vartree"].settings settings._init_dirs() setconfig = load_default_config(settings, root_trees) root_trees["root_config"] = RootConfig(settings, root_trees, setconfig) - - return trees[trees._target_eroot]['vartree'].settings, trees, mtimedb + + settings = trees[trees._target_eroot]['vartree'].settings + mtimedbfile = os.path.join(settings['EROOT'], portage.CACHE_PATH, "mtimedb") + mtimedb = portage.MtimeDB(mtimedbfile) + QueryCommand._db = trees + return settings, trees, mtimedb def chk_updated_cfg_files(eroot, config_protect): target_root = eroot |