From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 26 Jun 2008 18:49:14 +0000 (-0000)
Subject: Use settings["ROOT"] at the beginning of env_update() to avoid breakage
X-Git-Tag: v2.2_rc2~318
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2a58b0fb90f111b4362cfc2b80df044ecc7bba3;p=portage.git

Use settings["ROOT"] at the beginning of env_update() to avoid breakage
due to "root" being an ObjectProxy instance.

svn path=/main/trunk/; revision=10803
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 516be638d..7ccf5bdeb 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -541,8 +541,8 @@ class digraph(object):
 def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
 	env=None):
 	if target_root is None:
-		global root
-		target_root = root
+		global settings
+		target_root = settings["ROOT"]
 	if prev_mtimes is None:
 		global mtimedb
 		prev_mtimes = mtimedb["ldpath"]