summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-10 22:00:49 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-10 22:00:49 +0000
commitde7c932190ef7437c5e4c845b8390b1757a783e5 (patch)
tree427a676ff91336002fca107220227b0c4ed709f2
parentb05e7189df0daf32e5f582b8db5c62087e5e8613 (diff)
downloadportage-de7c932190ef7437c5e4c845b8390b1757a783e5.tar.gz
portage-de7c932190ef7437c5e4c845b8390b1757a783e5.tar.bz2
portage-de7c932190ef7437c5e4c845b8390b1757a783e5.zip
Enable use.{mask,force} and package.use.{mask,forc} as-directory in profiles.
svn path=/main/trunk/; revision=12419
-rw-r--r--pym/portage/__init__.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2b2609c75..8b19354a4 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1273,8 +1273,8 @@ class config(object):
self._pkeywords_list.append(cpdict)
# get profile-masked use flags -- INCREMENTAL Child over parent
- self.usemask_list = [grabfile(os.path.join(x, "use.mask")) \
- for x in self.profiles]
+ self.usemask_list = [grabfile(os.path.join(x, "use.mask"),
+ recursive=1) for x in self.profiles]
self.usemask = set(stack_lists(
self.usemask_list, incremental=True))
use_defs_lists = [grabdict(os.path.join(x, "use.defaults")) for x in self.profiles]
@@ -1282,9 +1282,8 @@ class config(object):
del use_defs_lists
self.pusemask_list = []
- rawpusemask = [grabdict_package(
- os.path.join(x, "package.use.mask")) \
- for x in self.profiles]
+ rawpusemask = [grabdict_package(os.path.join(x, "package.use.mask"),
+ recursive=1) for x in self.profiles]
for i in xrange(len(self.profiles)):
cpdict = {}
for k, v in rawpusemask[i].iteritems():
@@ -1302,14 +1301,14 @@ class config(object):
self.pkgprofileuse.append(cpdict)
del rawprofileuse
- self.useforce_list = [grabfile(os.path.join(x, "use.force")) \
- for x in self.profiles]
+ self.useforce_list = [grabfile(os.path.join(x, "use.force"),
+ recursive=1) for x in self.profiles]
self.useforce = set(stack_lists(
self.useforce_list, incremental=True))
self.puseforce_list = []
rawpuseforce = [grabdict_package(
- os.path.join(x, "package.use.force")) \
+ os.path.join(x, "package.use.force"), recursive=1) \
for x in self.profiles]
for i in xrange(len(self.profiles)):
cpdict = {}