diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-01-31 22:27:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-01-31 22:27:45 +0000 |
| commit | a893d41c2951055533944b985cc6045cceaf42a0 (patch) | |
| tree | 29126cc50e4e548230ead3a020c5e4fca3f8b889 | |
| parent | 15f0c600dd226561c5345d813b3e9d6af21b41ee (diff) | |
| download | portage-a893d41c2951055533944b985cc6045cceaf42a0.tar.gz portage-a893d41c2951055533944b985cc6045cceaf42a0.tar.bz2 portage-a893d41c2951055533944b985cc6045cceaf42a0.zip | |
Fix @module-rebuild to support $ROOT.
svn path=/main/trunk/; revision=15308
| -rw-r--r-- | cnf/sets.conf | 2 | ||||
| -rw-r--r-- | pym/portage/sets/__init__.py | 5 |
2 files changed, 5 insertions, 2 deletions
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 = {} |