Revert "MaskManager: Fix stacking of lines from master repositories."

This reverts commit 37f05a23fd55b633674f91f4d7658c19e41d2d63.
Reverting all masters recursion code for now (see bug #386569).

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 8bcaf7aa54c8ac4cf11c41009a70fa2c1c05d3bd..df93e105d58c86aad0cf852452e43c0f9066e657 100644 (file)
--- 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,