diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-09 12:08:55 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-09 12:08:55 -0700 |
| commit | caede8f642482b923c2d5ae7e630494dae849d4e (patch) | |
| tree | 21499439929cde320a952027d134cb72b94cdfb3 /pym | |
| parent | fd5807d6467be549717b35e67fc01be7a57bf432 (diff) | |
| download | portage-caede8f642482b923c2d5ae7e630494dae849d4e.tar.gz portage-caede8f642482b923c2d5ae7e630494dae849d4e.tar.bz2 portage-caede8f642482b923c2d5ae7e630494dae849d4e.zip | |
Revert "MaskManager: Fix stacking of lines from master repositories."
This reverts commit 37f05a23fd55b633674f91f4d7658c19e41d2d63.
Reverting all masters recursion code for now (see bug #386569).
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/package/ebuild/_config/MaskManager.py | 9 |
1 files changed, 4 insertions, 5 deletions
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, |