From caede8f642482b923c2d5ae7e630494dae849d4e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 9 Oct 2011 12:08:55 -0700 Subject: Revert "MaskManager: Fix stacking of lines from master repositories." This reverts commit 37f05a23fd55b633674f91f4d7658c19e41d2d63. Reverting all masters recursion code for now (see bug #386569). --- pym/portage/package/ebuild/_config/MaskManager.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py index 8bcaf7aa5..df93e105d 100644 --- a/pym/portage/package/ebuild/_config/MaskManager.py +++ b/pym/portage/package/ebuild/_config/MaskManager.py @@ -43,12 +43,11 @@ class MaskManager(object): for repo in repositories.repos_with_profiles(): lines = [] repo_lines = grab_pmask(repo.location) - master_lines = [] for master in repo.masters: - master_lines.extend(grab_pmask(master.location)) - lines.append(stack_lists([master_lines, repo_lines], incremental=1, - remember_source_file=True, warn_for_unmatched_removal=True, - strict_warn_for_unmatched_removal=strict_umatched_removal)) + master_lines = grab_pmask(master.location) + lines.append(stack_lists([master_lines, repo_lines], incremental=1, + remember_source_file=True, warn_for_unmatched_removal=True, + strict_warn_for_unmatched_removal=strict_umatched_removal)) if not repo.masters: lines.append(stack_lists([repo_lines], incremental=1, remember_source_file=True, warn_for_unmatched_removal=True, -- cgit v1.2.3-1-g7c22