From 37f05a23fd55b633674f91f4d7658c19e41d2d63 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sat, 8 Oct 2011 23:39:10 +0200 Subject: MaskManager: Fix stacking of lines from master repositories. --- pym/portage/package/ebuild/_config/MaskManager.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pym') diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py index df93e105d..8bcaf7aa5 100644 --- a/pym/portage/package/ebuild/_config/MaskManager.py +++ b/pym/portage/package/ebuild/_config/MaskManager.py @@ -43,11 +43,12 @@ 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 = 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.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)) 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