summaryrefslogtreecommitdiffstats
path: root/pym/portage/package/ebuild/_config/MaskManager.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/package/ebuild/_config/MaskManager.py')
-rw-r--r--pym/portage/package/ebuild/_config/MaskManager.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index 70ded2dae..c68a7a421 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -29,18 +29,16 @@ class MaskManager(object):
lines = []
repo_lines = grabfile_package(os.path.join(repo.location, "profiles", "package.mask"), \
recursive=1, remember_source_file=True, verify_eapi=True)
- masters = repo.masters
- if masters is None:
- masters = []
- main_repo = repositories.mainRepo()
- if main_repo is not None:
- masters.append(main_repo)
- for master in masters:
+ for master in repo.masters:
master_lines = grabfile_package(os.path.join(master.location, "profiles", "package.mask"), \
recursive=1, remember_source_file=True, verify_eapi=True)
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,
+ strict_warn_for_unmatched_removal=strict_umatched_removal))
repo_pkgmasklines.extend(append_repo(stack_lists(lines), repo.name, remember_source_file=True))
repo_pkgunmasklines = []