From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 11 Dec 2011 07:49:40 +0000 (-0800)
Subject: load_emerge_config: change order of code back
X-Git-Tag: v2.2.0_alpha80~1
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d67d11c82338a6d9ee073eab18bd0e24cd846c77;p=portage.git

load_emerge_config: change order of code back

A couple of recent commits touched this function, and code got moved
around unnecessarily.
---

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