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-0004uO-Ly 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 DBE5721C021; Sun, 8 Jan 2012 03:12:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A54DB21C021 for ; Sun, 8 Jan 2012 03:12:14 +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 271A21B4004 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 8333180043 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: <951c9b40cd45ba03daadbce94dfa87cda78675b0.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: 951c9b40cd45ba03daadbce94dfa87cda78675b0 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: 35050d52-8201-4bce-b1fc-3653bc928412 X-Archives-Hash: cf01ef602abea903326a135e42caf0bc commit: 951c9b40cd45ba03daadbce94dfa87cda78675b0 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Sun Jan 8 03:00:07 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Sun Jan 8 03:00:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D951c9b40 Set eapi attribute on portage.repository.config.RepoConfig objects. --- pym/portage/repository/config.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 1db691b..2734156 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -1,4 +1,4 @@ -# Copyright 2010-2011 Gentoo Foundation +# Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 import io @@ -19,8 +19,8 @@ from portage import eclass_cache, os from portage.const import (MANIFEST2_HASH_FUNCTIONS, MANIFEST2_REQUIRED_= HASH, REPO_NAME_LOC, USER_CONFIG_PATH) from portage.env.loaders import KeyValuePairFileLoader -from portage.util import (normalize_path, writemsg, writemsg_level, - shlex_split, stack_lists) +from portage.util import (normalize_path, read_corresponding_eapi_file, = shlex_split, + stack_lists, writemsg, writemsg_level) from portage.localization import _ from portage import _unicode_decode from portage import _unicode_encode @@ -46,7 +46,7 @@ class RepoConfig(object): """Stores config of one repository""" =20 __slots__ =3D ('aliases', 'allow_missing_manifest', - 'cache_formats', 'create_manifest', 'disable_manifest', + 'cache_formats', 'create_manifest', 'disable_manifest', 'eapi', 'eclass_db', 'eclass_locations', 'eclass_overrides', 'format', 'locati= on', 'main_repo', 'manifest_hashes', 'masters', 'missing_repo_name', 'name', 'priority', 'sign_manifest', 'sync', 'thin_manifest', @@ -106,12 +106,15 @@ class RepoConfig(object): location =3D None self.location =3D location =20 + eapi =3D None missing =3D True if self.location is not None: + eapi =3D read_corresponding_eapi_file(os.path.join(self.location, REP= O_NAME_LOC)) name, missing =3D self._read_valid_repo_name(self.location) - elif name =3D=3D "DEFAULT":=20 missing =3D False + + self.eapi =3D eapi self.name =3D name self.missing_repo_name =3D missing self.sign_manifest =3D True