load_emerge_config: change order of code back
authorZac Medico <zmedico@gentoo.org>
Sun, 11 Dec 2011 07:49:40 +0000 (23:49 -0800)
committerZac Medico <zmedico@gentoo.org>
Sun, 11 Dec 2011 07:49:40 +0000 (23:49 -0800)
A couple of recent commits touched this function, and code got moved
around unnecessarily.

pym/_emerge/actions.py

index 484f6b09bf20f88524fcf194f1dd2df0d28461c2..b3d0b12685dc49aff49c730d75c3fa2113c11531 100644 (file)
@@ -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