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 516be638d6d54797cc9fb09d8135b3183d29bd15..7ccf5bdeba31013e7b2a5b552b0fa2cbc9751065 100644 (file)
--- 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"]