| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-31 22:21:15 +0000 (Sun, 31 Jan 2010) |
| 3 |
New Revision: 15307 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/cnf/sets.conf |
| 7 |
main/trunk/pym/portage/sets/__init__.py |
| 8 |
Log: |
| 9 |
Bug #298141 - Make /etc/portage/sets relative to PORTAGE_CONFIGROOT. Thanks |
| 10 |
to Martin Gysel (bearsh) <m.gysel@×××.ch> for this patch. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/cnf/sets.conf |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/cnf/sets.conf 2010-01-31 21:53:20 UTC (rev 15306) |
| 16 |
+++ main/trunk/cnf/sets.conf 2010-01-31 22:21:15 UTC (rev 15307) |
| 17 |
@@ -44,7 +44,7 @@ |
| 18 |
[usersets] |
| 19 |
class = portage.sets.files.StaticFileSet |
| 20 |
multiset = true |
| 21 |
-directory = /etc/portage/sets |
| 22 |
+directory = %(PORTAGE_CONFIGROOT)setc/portage/sets |
| 23 |
|
| 24 |
# Set to rebuild all packages that need a preserved lib that only remains due |
| 25 |
# to FEATURES=preserve-libs |
| 26 |
|
| 27 |
Modified: main/trunk/pym/portage/sets/__init__.py |
| 28 |
=================================================================== |
| 29 |
--- main/trunk/pym/portage/sets/__init__.py 2010-01-31 21:53:20 UTC (rev 15306) |
| 30 |
+++ main/trunk/pym/portage/sets/__init__.py 2010-01-31 22:21:15 UTC (rev 15307) |
| 31 |
@@ -34,7 +34,8 @@ |
| 32 |
|
| 33 |
class SetConfig(object): |
| 34 |
def __init__(self, paths, settings, trees): |
| 35 |
- self._parser = SafeConfigParser() |
| 36 |
+ self._parser = SafeConfigParser( |
| 37 |
+ defaults={"PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"]}) |
| 38 |
self._parser.read(paths) |
| 39 |
self.errors = [] |
| 40 |
self.psets = {} |
Archives