From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 8 Jan 2012 03:06:31 +0000 (+0100) Subject: Set portage-1 as default profile format for repositories using EAPI="4-python". X-Git-Tag: v2.2.0_alpha85~49 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=440acc06b175f642de305f063fbf63805cdce3d8;p=portage.git Set portage-1 as default profile format for repositories using EAPI="4-python". --- 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'])