From f1181281ba1be9181fa65238f91661625a1432bd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 27 Jun 2013 18:54:20 -0700 Subject: [PATCH] RepoConfigLoader: support repos.conf directory --- pym/portage/repository/config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index c0f20079e..fded7bd78 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -24,7 +24,7 @@ from portage.const import (MANIFEST2_HASH_FUNCTIONS, MANIFEST2_REQUIRED_HASH, from portage.eapi import eapi_allows_directories_on_profile_level_and_repository_level from portage.env.loaders import KeyValuePairFileLoader from portage.util import (normalize_path, read_corresponding_eapi_file, shlex_split, - stack_lists, writemsg, writemsg_level) + stack_lists, writemsg, writemsg_level, _recursive_file_list) from portage.util._path import exists_raise_eaccess, isdir_raise_eaccess from portage.localization import _ from portage import _unicode_decode @@ -477,7 +477,14 @@ class RepoConfigLoader(object): read_file = parser.readfp source_kwarg = 'filename' + recursive_paths = [] for p in paths: + if isinstance(p, basestring): + recursive_paths.extend(_recursive_file_list(p)) + else: + recursive_paths.append(p) + + for p in recursive_paths: if isinstance(p, basestring): f = None try: -- 2.26.2