commit: 62e8b0cc63799781224e266896f1fc6315ec9da1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 19:44:13 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 19:44:13 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=62e8b0cc
MaskManager: remove prefix local hack for bug #556694
Apparently, at some point in time, this hack seemed to be necessary, but
maybe that was because our profiles weren't quite in order. Today, it
seems to do harm (see bug #556694) and when removed things seem to
straighten themselves.
pym/portage/package/ebuild/_config/MaskManager.py | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/pym/portage/package/ebuild/_config/MaskManager.py
b/pym/portage/package/ebuild/_config/MaskManager.py
index 303904a..44aba23 100644
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -120,17 +120,6 @@ class MaskManager(object):
#to allow profiles to override masks from their parent profiles.
profile_pkgmasklines = []
profile_pkgunmasklines = []
- # PREFIX LOCAL: Prefix has unmasks for stuff in
profiles/package.mask
- # If we don't consider the repomasks here, those unmasks are
- # lost, causing lots of issues (e.g. Portage being masked)
- # for minimal/concentrated code change, empty repo_pkgmasklines
here
- # such that they don't count double
- import collections
- _profile_node = collections.namedtuple('_profile_node',
- 'location portage1_directories')
- repo_pkgmasklines = []
- repo_pkgunmasklines = []
- # END PREFIX LOCAL
for x in profiles:
profile_pkgmasklines.append(grabfile_package(
os.path.join(x.location, "package.mask"),
