From: Fabian Groffen Date: Fri, 2 Dec 2011 20:23:04 +0000 (+0100) Subject: MaskManager: fix Prefix' all profiles addition X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8150064315a7e8b8a2ddba271934c1e17ee0b31b;p=portage.git MaskManager: fix Prefix' all profiles addition Construct _profile_nodes since the loop below expects those, copy from LocationManager. --- diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py index 7d44e7960..814256ab7 100644 --- a/pym/portage/package/ebuild/_config/MaskManager.py +++ b/pym/portage/package/ebuild/_config/MaskManager.py @@ -121,12 +121,16 @@ class MaskManager(object): # 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 = [] all_profiles = [] for repo in repositories.repos_with_profiles(): - all_profiles.append(os.path.join(repo.location, "profiles")) + all_profiles.append(_profile_node(repo.location, True)) all_profiles.extend(profiles) + # END PREFIX LOCAL for x in all_profiles: profile_pkgmasklines.append(grabfile_package( os.path.join(x.location, "package.mask"),