Fix @module-rebuild to support $ROOT.

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

diff --git a/cnf/sets.conf b/cnf/sets.conf
index f092c6a2fb72e75aba894d1791417014582ca0cd..46c86e7506f4b1e91e4279d4d85fde59efa94aba 100644 (file)
--- 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 9c2b860112fd30e81794bdc1ed2bd6713dbfb15a..65ade2e54464a51fdef2544e87c8e8a2036c843b 100644 (file)
--- 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 = {}