Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15308 - in main/trunk: cnf pym/portage/sets
Date: Sun, 31 Jan 2010 22:27:47
Message-Id: E1NbiGf-0002dI-SY@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-31 22:27:45 +0000 (Sun, 31 Jan 2010)
3 New Revision: 15308
4
5 Modified:
6 main/trunk/cnf/sets.conf
7 main/trunk/pym/portage/sets/__init__.py
8 Log:
9 Fix @module-rebuild to support $ROOT.
10
11
12 Modified: main/trunk/cnf/sets.conf
13 ===================================================================
14 --- main/trunk/cnf/sets.conf 2010-01-31 22:21:15 UTC (rev 15307)
15 +++ main/trunk/cnf/sets.conf 2010-01-31 22:27:45 UTC (rev 15308)
16 @@ -63,7 +63,7 @@
17 [module-rebuild]
18 class = portage.sets.dbapi.OwnerSet
19 world-candidate = False
20 -files = /lib/modules
21 +files = %(ROOT)slib/modules
22
23 # Installed packages for which the highest visible ebuild
24 # version is lower than the currently installed version.
25
26 Modified: main/trunk/pym/portage/sets/__init__.py
27 ===================================================================
28 --- main/trunk/pym/portage/sets/__init__.py 2010-01-31 22:21:15 UTC (rev 15307)
29 +++ main/trunk/pym/portage/sets/__init__.py 2010-01-31 22:27:45 UTC (rev 15308)
30 @@ -35,7 +35,10 @@
31 class SetConfig(object):
32 def __init__(self, paths, settings, trees):
33 self._parser = SafeConfigParser(
34 - defaults={"PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"]})
35 + defaults={
36 + "PORTAGE_CONFIGROOT" : settings["PORTAGE_CONFIGROOT"],
37 + "ROOT" : settings["ROOT"],
38 + })
39 self._parser.read(paths)
40 self.errors = []
41 self.psets = {}