From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 27 Mar 2013 04:15:25 +0000 (-0700)
Subject: make.defaults: recurse directories
X-Git-Tag: v2.2.0_alpha170~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=90f0df42d8888d598e4a2f5cc891b2fcbef2f500;p=portage.git

make.defaults: recurse directories

This makes behavior more consistent with handling of other files, as
discussed in bug #463266.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 1d2e4a60a..318bb3d6f 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -524,7 +524,7 @@ class config(object):
 			mygcfg = {}
 			if self.profiles:
 				mygcfg_dlists = [getconfig(os.path.join(x, "make.defaults"),
-					tolerant=tolerant, expand=expand_map)
+					tolerant=tolerant, expand=expand_map, recursive=True)
 					for x in self.profiles]
 				self._make_defaults = mygcfg_dlists
 				mygcfg = stack_dicts(mygcfg_dlists,
@@ -638,7 +638,7 @@ class config(object):
 			self._repo_make_defaults = {}
 			for repo in self.repositories.repos_with_profiles():
 				d = getconfig(os.path.join(repo.location, "profiles", "make.defaults"),
-					tolerant=tolerant, expand=self.configdict["globals"].copy()) or {}
+					tolerant=tolerant, expand=self.configdict["globals"].copy(), recursive=True) or {}
 				if d:
 					for k in chain(self._env_blacklist,
 						profile_only_variables, self._global_only_vars):