diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-12 08:26:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-12 08:26:45 +0000 |
| commit | 81b1161f92acccc7dd4e176f5891113b8b37fa1e (patch) | |
| tree | d8d7cc8f8821eaf95cc7eb12d3780014d003c0fd | |
| parent | 62133aa327d1754eaaee5d16c59d6eb11efa4917 (diff) | |
| download | portage-81b1161f92acccc7dd4e176f5891113b8b37fa1e.tar.gz portage-81b1161f92acccc7dd4e176f5891113b8b37fa1e.tar.bz2 portage-81b1161f92acccc7dd4e176f5891113b8b37fa1e.zip | |
Enable use.{mask,force} and package.use.{mask,forc} as-directory in profiles.
(trunk r12419)
svn path=/main/branches/2.1.6/; revision=12475
| -rw-r--r-- | pym/portage/__init__.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 4050289ca..e94d617bd 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 = {} |