From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 31 Jan 2010 22:21:15 +0000 (-0000)
Subject: Bug #298141 - Make /etc/portage/sets relative to PORTAGE_CONFIGROOT. Thanks
X-Git-Tag: v2.2_rc63~89
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15f0c600dd226561c5345d813b3e9d6af21b41ee;p=portage.git

Bug #298141 - Make /etc/portage/sets relative to PORTAGE_CONFIGROOT. Thanks
to Martin Gysel (bearsh) <m.gysel@gmx.ch> for this patch.

svn path=/main/trunk/; revision=15307
---

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 = {}