| 1 |
--- |
| 2 |
pym/portage/package/ebuild/_config/LocationsManager.py | 10 +++++++--- |
| 3 |
1 file changed, 7 insertions(+), 3 deletions(-) |
| 4 |
|
| 5 |
diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py |
| 6 |
index 4427f1d..8bf321c 100644 |
| 7 |
--- a/pym/portage/package/ebuild/_config/LocationsManager.py |
| 8 |
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py |
| 9 |
@@ -31,7 +31,7 @@ _PORTAGE1_DIRECTORIES = frozenset([ |
| 10 |
'use.mask', 'use.force']) |
| 11 |
|
| 12 |
_profile_node = collections.namedtuple('_profile_node', |
| 13 |
- 'location portage1_directories user_config') |
| 14 |
+ 'location portage1_directories user_config profile_formats') |
| 15 |
|
| 16 |
_allow_parent_colon = frozenset( |
| 17 |
["portage-2"]) |
| 18 |
@@ -132,7 +132,7 @@ class LocationsManager(object): |
| 19 |
self.user_profile_dir = custom_prof |
| 20 |
self.profiles.append(custom_prof) |
| 21 |
self.profiles_complex.append( |
| 22 |
- _profile_node(custom_prof, True, True)) |
| 23 |
+ _profile_node(custom_prof, True, True, ())) |
| 24 |
del custom_prof |
| 25 |
|
| 26 |
self.profiles = tuple(self.profiles) |
| 27 |
@@ -151,6 +151,7 @@ class LocationsManager(object): |
| 28 |
allow_parent_colon = True |
| 29 |
repo_loc = None |
| 30 |
compat_mode = False |
| 31 |
+ current_formats = () |
| 32 |
|
| 33 |
eapi_file = os.path.join(currentPath, "eapi") |
| 34 |
eapi = "0" |
| 35 |
@@ -183,6 +184,8 @@ class LocationsManager(object): |
| 36 |
layout_data['profile-formats'] == ('portage-1-compat',) |
| 37 |
allow_parent_colon = any(x in _allow_parent_colon |
| 38 |
for x in layout_data['profile-formats']) |
| 39 |
+ current_formats = tuple(layout_data['profile-formats']) |
| 40 |
+ |
| 41 |
|
| 42 |
if compat_mode: |
| 43 |
offenders = _PORTAGE1_DIRECTORIES.intersection(os.listdir(currentPath)) |
| 44 |
@@ -233,7 +236,8 @@ class LocationsManager(object): |
| 45 |
|
| 46 |
self.profiles.append(currentPath) |
| 47 |
self.profiles_complex.append( |
| 48 |
- _profile_node(currentPath, allow_directories, False)) |
| 49 |
+ _profile_node(currentPath, allow_directories, False, |
| 50 |
+ current_formats)) |
| 51 |
|
| 52 |
def _expand_parent_colon(self, parentsFile, parentPath, |
| 53 |
repo_loc, repositories): |
| 54 |
-- |
| 55 |
2.1.0.rc2.206.gedb03e5 |
Archives