diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2012-01-08 04:06:31 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2012-01-08 04:06:31 +0100 |
| commit | 440acc06b175f642de305f063fbf63805cdce3d8 (patch) | |
| tree | 876ae21c01335a4a0feef8eb84f7470dbbc7e8d6 /pym/portage/repository | |
| parent | 951c9b40cd45ba03daadbce94dfa87cda78675b0 (diff) | |
| download | portage-440acc06b175f642de305f063fbf63805cdce3d8.tar.gz portage-440acc06b175f642de305f063fbf63805cdce3d8.tar.bz2 portage-440acc06b175f642de305f063fbf63805cdce3d8.zip | |
Set portage-1 as default profile format for repositories using EAPI="4-python".
Diffstat (limited to 'pym/portage/repository')
| -rw-r--r-- | pym/portage/repository/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 273415604..3207b3087 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -669,6 +669,7 @@ def _get_repo_name(repo_location, cached=None): return name def parse_layout_conf(repo_location, repo_name=None): + eapi = read_corresponding_eapi_file(os.path.join(repo_location, REPO_NAME_LOC)) layout_filename = os.path.join(repo_location, "metadata", "layout.conf") layout_file = KeyValuePairFileLoader(layout_filename, None, None) @@ -742,7 +743,10 @@ def parse_layout_conf(repo_location, repo_name=None): raw_formats = layout_data.get('profile-formats') if raw_formats is None: - raw_formats = ('portage-1-compat',) + if eapi in ('4-python',): + raw_formats = ('portage-1',) + else: + raw_formats = ('portage-1-compat',) else: raw_formats = set(raw_formats.split()) unknown = raw_formats.difference(['pms', 'portage-1']) |