From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 20 Sep 2010 15:43:43 +0000 (+0200)
Subject: ConfigProtect is initialised with EROOT these days, so no need to add EPREFIX to it
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1f943c43448eeb7059e74f82caa8c41f0b32a7a6;p=portage.git

ConfigProtect is initialised with EROOT these days, so no need to add EPREFIX to it
---

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index eccfdd5a9..a01d28e26 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -44,7 +44,7 @@ from portage.exception import InvalidAtom, PortageException, FileNotFound, \
 from portage.localization import _
 from portage.proxy.objectproxy import ObjectProxy
 from portage.cache.mappings import UserDict
-from portage.const import EPREFIX, EPREFIX_LSTRIP
+from portage.const import EPREFIX
 
 noiselimit = 0
 
@@ -1374,7 +1374,7 @@ class ConfigProtect(object):
 		self._dirs = set()
 		for x in self.protect_list:
 			ppath = normalize_path(
-				os.path.join(self.myroot + EPREFIX_LSTRIP, x.lstrip(os.path.sep)))
+				os.path.join(self.myroot, x.lstrip(os.path.sep)))
 			try:
 				if stat.S_ISDIR(os.stat(ppath).st_mode):
 					self._dirs.add(ppath)
@@ -1386,7 +1386,7 @@ class ConfigProtect(object):
 		self.protectmask = []
 		for x in self.mask_list:
 			ppath = normalize_path(
-				os.path.join(self.myroot + EPREFIX_LSTRIP, x.lstrip(os.path.sep)))
+				os.path.join(self.myroot, x.lstrip(os.path.sep)))
 			try:
 				"""Use lstat so that anything, even a broken symlink can be
 				protected."""