From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RjjBH-0004tl-PX for garchives@archives.gentoo.org; Sun, 08 Jan 2012 03:12:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 491D521C023; Sun, 8 Jan 2012 03:12:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1C4FD21C023 for ; Sun, 8 Jan 2012 03:12:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E9721B400F for ; Sun, 8 Jan 2012 03:12:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B401C8004C for ; Sun, 8 Jan 2012 03:12:13 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <440acc06b175f642de305f063fbf63805cdce3d8.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 440acc06b175f642de305f063fbf63805cdce3d8 Date: Sun, 8 Jan 2012 03:12:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6187231e-e017-4c54-ad24-3f88f1541b93 X-Archives-Hash: 7d7ad3715e0104a684503cfa857b5c05 commit: 440acc06b175f642de305f063fbf63805cdce3d8 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Sun Jan 8 03:06:31 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Sun Jan 8 03:06:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D440acc06 Set portage-1 as default profile format for repositories using EAPI=3D"4-= python". --- 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/co= nfig.py index 2734156..3207b30 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -669,6 +669,7 @@ def _get_repo_name(repo_location, cached=3DNone): return name =20 def parse_layout_conf(repo_location, repo_name=3DNone): + eapi =3D read_corresponding_eapi_file(os.path.join(repo_location, REPO_= NAME_LOC)) =20 layout_filename =3D os.path.join(repo_location, "metadata", "layout.con= f") layout_file =3D KeyValuePairFileLoader(layout_filename, None, None) @@ -742,7 +743,10 @@ def parse_layout_conf(repo_location, repo_name=3DNon= e): =20 raw_formats =3D layout_data.get('profile-formats') if raw_formats is None: - raw_formats =3D ('portage-1-compat',) + if eapi in ('4-python',): + raw_formats =3D ('portage-1',) + else: + raw_formats =3D ('portage-1-compat',) else: raw_formats =3D set(raw_formats.split()) unknown =3D raw_formats.difference(['pms', 'portage-1'])