From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 31 Jan 2010 22:27:45 +0000 (-0000)
Subject: Fix @module-rebuild to support $ROOT.
X-Git-Tag: v2.2_rc63~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a893d41c2951055533944b985cc6045cceaf42a0;p=portage.git

Fix @module-rebuild to support $ROOT.

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

diff --git a/cnf/sets.conf b/cnf/sets.conf
index f092c6a2f..46c86e750 100644
--- a/cnf/sets.conf
+++ b/cnf/sets.conf
@@ -63,7 +63,7 @@ includes = bzr cvs darcs git mercurial subversion tla
 [module-rebuild]
 class = portage.sets.dbapi.OwnerSet
 world-candidate = False
-files = /lib/modules
+files = %(ROOT)slib/modules
 
 # Installed packages for which the highest visible ebuild
 # version is lower than the currently installed version.
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 9c2b86011..65ade2e54 100644
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -35,7 +35,10 @@ class SetConfigError(Exception):
 class SetConfig(object):
 	def __init__(self, paths, settings, trees):
 		self._parser = SafeConfigParser(
-			defaults={"PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"]})
+			defaults={
+				"PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"],
+				"ROOT" : settings["ROOT"],
+			})
 		self._parser.read(paths)
 		self.errors = []
 		self.psets = {}