From e5d81fec049a0ef54a56704d922b70855c3b731d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 8 Sep 2010 08:39:47 -0700 Subject: Adjust OwnersSet configurations to omit $EROOT since, and add a note about OwnersSet.mapPathsToAtoms() behavior in the docstring. --- cnf/sets/portage.conf | 6 +++--- pym/portage/_sets/dbapi.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf index 34819fb22..49f25f666 100644 --- 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 9bbc6df3d..d32f1b7b8 100644 --- 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 -- cgit v1.2.3-1-g7c22