MaskManager: fix Prefix' all profiles addition
authorFabian Groffen <grobian@gentoo.org>
Fri, 2 Dec 2011 20:23:04 +0000 (21:23 +0100)
committerFabian Groffen <grobian@gentoo.org>
Fri, 2 Dec 2011 20:23:04 +0000 (21:23 +0100)
Construct _profile_nodes since the loop below expects those, copy from
LocationManager.

pym/portage/package/ebuild/_config/MaskManager.py

index 7d44e796011d5936b943800c7a9e52674b4960f7..814256ab749e18083a467f2a48703ffdbaa0329f 100644 (file)
@@ -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"),