Adjust OwnersSet configurations to omit $EROOT since, and add a

note about OwnersSet.mapPathsToAtoms() behavior in the docstring.

diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf
index 34819fb2299cb59675d5b8446dc21c4617446a33..49f25f666ee1f2046b43af28dda5b257e1011d0f 100644 (file)
--- a/cnf/sets/portage.conf
+++ b/cnf/sets/portage.conf
@@ -56,14 +56,14 @@ includes = bzr cvs darcs git mercurial subversion tla
 # Installed packages that own files inside /lib/modules.
 [module-rebuild]
 class = portage.sets.dbapi.OwnerSet
-files = %(EROOT)slib/modules
+files = /lib/modules
 
 # Installed packages that own files inside /usr/lib/xorg/modules,
 # excluding the package that owns /usr/bin/Xorg.
 [x11-module-rebuild]
 class = portage.sets.dbapi.OwnerSet
-files = %(EROOT)susr/lib/xorg/modules
-exclude-files = %(EROOT)susr/bin/Xorg
+files = /usr/lib/xorg/modules
+exclude-files = /usr/bin/Xorg
 
 # Binary packages that have a different build time from a currently
 # installed package of the exact same version.

diff --git a/pym/portage/_sets/dbapi.py b/pym/portage/_sets/dbapi.py
index 9bbc6df3d509d85c1ce921a2460b643f8b8c58aa..d32f1b7b8fc8314ec602f86ad9cf0b2ed793e604 100644 (file)
--- a/pym/portage/_sets/dbapi.py
+++ b/pym/portage/_sets/dbapi.py
@@ -71,6 +71,9 @@ class OwnerSet(PackageSet):
                self._files = files
 
        def mapPathsToAtoms(self, paths, exclude_paths=None):
+               """
+               All paths must have $EROOT stripped from the left side.
+               """
                rValue = set()
                vardb = self._db
                aux_get = vardb.aux_get