aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2011-10-08 21:39:10 (GMT)
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2011-10-08 21:39:10 (GMT)
commit37f05a23fd55b633674f91f4d7658c19e41d2d63 (patch)
tree5625e1010451a29b2b369bc70d3a07e9e17bbc6f
parentRepoConfigLoader: Recursively expand masters. (diff)
downloadportage-37f05a23fd55b633674f91f4d7658c19e41d2d63.zip
portage-37f05a23fd55b633674f91f4d7658c19e41d2d63.tar.gz
portage-37f05a23fd55b633674f91f4d7658c19e41d2d63.tar.bz2
MaskManager: Fix stacking of lines from master repositories.
-rw-r--r--pym/portage/package/ebuild/_config/MaskManager.py9
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 df93e10..8bcaf7a 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,