From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 15 Dec 2010 17:58:45 +0000 (+0100)
Subject: removeFromContents: don't use EROOT
X-Git-Tag: v2.2.0_alpha9~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85f87007e2f031bee90d6130a6cc121a20ff98c0;p=portage.git

removeFromContents: don't use EROOT

Fix bug #348790, make sure that CONTENTS entries keep their EPREFIX, by
using ROOT, instead of EROOT.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index d269e93ea..8e3f9bae4 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -772,7 +772,7 @@ class vardbapi(dbapi):
 		"""
 		if not hasattr(pkg, "getcontents"):
 			pkg = self._dblink(pkg)
-		root = self._eroot
+		root = self.settings['ROOT']
 		root_len = len(root) - 1
 		new_contents = pkg.getcontents().copy()
 		removed = 0