| 1 |
commit: 8150064315a7e8b8a2ddba271934c1e17ee0b31b |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 2 20:23:04 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 20:23:04 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=81500643 |
| 7 |
|
| 8 |
MaskManager: fix Prefix' all profiles addition |
| 9 |
|
| 10 |
Construct _profile_nodes since the loop below expects those, copy from |
| 11 |
LocationManager. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/package/ebuild/_config/MaskManager.py | 6 +++++- |
| 15 |
1 files changed, 5 insertions(+), 1 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py |
| 18 |
index 7d44e79..814256a 100644 |
| 19 |
--- a/pym/portage/package/ebuild/_config/MaskManager.py |
| 20 |
+++ b/pym/portage/package/ebuild/_config/MaskManager.py |
| 21 |
@@ -121,12 +121,16 @@ class MaskManager(object): |
| 22 |
# lost, causing lots of issues (e.g. Portage being masked) |
| 23 |
# for minimal/concentrated code change, empty repo_pkgmasklines here |
| 24 |
# such that they don't count double |
| 25 |
+ import collections |
| 26 |
+ _profile_node = collections.namedtuple('_profile_node', |
| 27 |
+ 'location portage1_directories') |
| 28 |
repo_pkgmasklines = [] |
| 29 |
repo_pkgunmasklines = [] |
| 30 |
all_profiles = [] |
| 31 |
for repo in repositories.repos_with_profiles(): |
| 32 |
- all_profiles.append(os.path.join(repo.location, "profiles")) |
| 33 |
+ all_profiles.append(_profile_node(repo.location, True)) |
| 34 |
all_profiles.extend(profiles) |
| 35 |
+ # END PREFIX LOCAL |
| 36 |
for x in all_profiles: |
| 37 |
profile_pkgmasklines.append(grabfile_package( |
| 38 |
os.path.join(x.location, "package.mask"), |
Archives