diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2011-10-08 23:39:10 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2011-10-08 23:39:10 +0200 |
| commit | 37f05a23fd55b633674f91f4d7658c19e41d2d63 (patch) | |
| tree | 5625e1010451a29b2b369bc70d3a07e9e17bbc6f | |
| parent | ab2a6cc357ba3c8272a4a1556e2c0bcd4bee102e (diff) | |
| download | portage-37f05a23fd55b633674f91f4d7658c19e41d2d63.tar.gz portage-37f05a23fd55b633674f91f4d7658c19e41d2d63.tar.bz2 portage-37f05a23fd55b633674f91f4d7658c19e41d2d63.zip | |
MaskManager: Fix stacking of lines from master repositories.
| -rw-r--r-- | pym/portage/package/ebuild/_config/MaskManager.py | 9 |
1 files changed, 5 insertions, 4 deletions
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, |