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 1SSzQo-0002Gm-Lw for garchives@archives.gentoo.org; Fri, 11 May 2012 23:39:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9F4CE072E; Fri, 11 May 2012 23:39:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 99BCCE072E for ; Fri, 11 May 2012 23:39:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 160DA1B4032 for ; Fri, 11 May 2012 23:39:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D3C34E542D for ; Fri, 11 May 2012 23:39:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1336779546.22996b1d7c7214da8f0bff76d9f814a00f58fdce.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/, pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/_config/LocationsManager.py pym/portage/repository/config.py X-VCS-Directories: pym/portage/package/ebuild/_config/ pym/portage/repository/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 22996b1d7c7214da8f0bff76d9f814a00f58fdce X-VCS-Branch: master Date: Fri, 11 May 2012 23:39:19 +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: f4fb1bf8-d26d-4800-a6a5-cade9578e964 X-Archives-Hash: 6420adfdf9dd568025e3d0ddf1ccff31 commit: 22996b1d7c7214da8f0bff76d9f814a00f58fdce Author: Zac Medico gentoo org> AuthorDate: Fri May 11 23:39:06 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri May 11 23:39:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D22996b1d Cleanup profile-formats code. --- .../package/ebuild/_config/LocationsManager.py | 5 ++++- pym/portage/repository/config.py | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym= /portage/package/ebuild/_config/LocationsManager.py index 368c0dd..337edc4 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -28,6 +28,9 @@ _PORTAGE1_DIRECTORIES =3D frozenset([ _profile_node =3D collections.namedtuple('_profile_node', 'location portage1_directories') =20 +_allow_directories =3D frozenset( + ["portage-1-compat", "portage-1"]) + class LocationsManager(object): =20 def __init__(self, config_root=3DNone, eprefix=3DNone, config_profile_p= ath=3DNone, local_config=3DTrue, \ @@ -130,7 +133,7 @@ class LocationsManager(object): # protect against nested repositories. Insane configuration, but the= longest # path will be the correct one. repo_loc, layout_data =3D max(intersecting_repos, key=3Dlambda x:len(= x[0])) - allow_directories =3D any(x.startswith("portage-1") + allow_directories =3D any(x in _allow_directories for x in layout_data['profile-formats']) compat_mode =3D layout_data['profile-formats'] =3D=3D ('portage-1-com= pat',) =20 diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index 71aefde..872c189 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -27,6 +27,9 @@ from portage import _unicode_encode from portage import _encodings from portage import manifest =20 +_valid_profile_formats =3D frozenset( + ['pms', 'portage-1']) + _repo_name_sub_re =3D re.compile(r'[^\w-]') =20 def _gen_valid_repo(name): @@ -754,7 +757,7 @@ def parse_layout_conf(repo_location, repo_name=3DNone= ): raw_formats =3D ('portage-1-compat',) else: raw_formats =3D set(raw_formats.split()) - unknown =3D raw_formats.difference(['pms', 'portage-1']) + unknown =3D raw_formats.difference(_valid_profile_formats) if unknown: repo_name =3D _get_repo_name(repo_location, cached=3Drepo_name) warnings.warn((_("Repository named '%(repo_name)s' has unsupported " @@ -764,7 +767,7 @@ def parse_layout_conf(repo_location, repo_name=3DNone= ): layout_filename=3Dlayout_filename, unknown_fmts=3D" ".join(unknown))), DeprecationWarning) - raw_formats =3D tuple(raw_formats.intersection(['pms', 'portage-1'])) + raw_formats =3D tuple(raw_formats.intersection(_valid_profile_formats)= ) data['profile-formats'] =3D raw_formats =20 return data, layout_errors