summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cnf/sets.conf2
-rw-r--r--pym/portage/sets/__init__.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/cnf/sets.conf b/cnf/sets.conf
index 912eb706b..f092c6a2f 100644
--- a/cnf/sets.conf
+++ b/cnf/sets.conf
@@ -44,7 +44,7 @@ world-candidate = False
[usersets]
class = portage.sets.files.StaticFileSet
multiset = true
-directory = /etc/portage/sets
+directory = %(PORTAGE_CONFIGROOT)setc/portage/sets
# Set to rebuild all packages that need a preserved lib that only remains due
# to FEATURES=preserve-libs
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 78f2628bd..9c2b86011 100644
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -34,7 +34,8 @@ class SetConfigError(Exception):
class SetConfig(object):
def __init__(self, paths, settings, trees):
- self._parser = SafeConfigParser()
+ self._parser = SafeConfigParser(
+ defaults={"PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"]})
self._parser.read(paths)
self.errors = []
self.psets = {}