Add EROOT support to the @module-rebuild package set.

diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf
index 2a66512e7391f6f8364ecdead5be8f8198d199c6..a21b587aa17e2be34f0d91d005b73f772812e23f 100644 (file)
--- a/cnf/sets/portage.conf
+++ b/cnf/sets/portage.conf
@@ -56,7 +56,7 @@ includes = bzr cvs darcs git mercurial subversion tla
 # Installed packages that own files inside /lib/modules.
 [module-rebuild]
 class = portage.sets.dbapi.OwnerSet
-files = %(ROOT)slib/modules
+files = %(EROOT)slib/modules
 
 # Binary packages that have a different build time from a currently
 # installed package of the exact same version.

diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 2f65f98bf8411ade3e6e2e6bb2fd492735180557..a942ac94aaea8b76798040a17f0051f1fc3fbd05 100644 (file)
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -35,6 +35,8 @@ class SetConfig(object):
        def __init__(self, paths, settings, trees):
                self._parser = SafeConfigParser(
                        defaults={
+                               "EPREFIX" : settings["EPREFIX"],
+                               "EROOT" : settings["EROOT"],
                                "PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"],
                                "ROOT" : settings["ROOT"],
                        })