summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-26 18:49:14 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-26 18:49:14 +0000
commitc2a58b0fb90f111b4362cfc2b80df044ecc7bba3 (patch)
tree4e996b1f6a1390a0c3c5823339cd72feb9bc2da0
parent92b579d48d4028e995a3109837c9328fb07e06ce (diff)
downloadportage-c2a58b0fb90f111b4362cfc2b80df044ecc7bba3.tar.gz
portage-c2a58b0fb90f111b4362cfc2b80df044ecc7bba3.tar.bz2
portage-c2a58b0fb90f111b4362cfc2b80df044ecc7bba3.zip
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
-rw-r--r--pym/portage/__init__.py4
1 files changed, 2 insertions, 2 deletions
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"]