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 1ST3cy-0006km-W1 for garchives@archives.gentoo.org; Sat, 12 May 2012 04:08:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FFFCE0802; Sat, 12 May 2012 04:08:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1AE11E0802 for ; Sat, 12 May 2012 04:08:07 +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 311D51B4053 for ; Sat, 12 May 2012 04:08:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B608DE542D for ; Sat, 12 May 2012 04:08:05 +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: <1336795632.0098ee7395e2c9b35471a5c088eef1fa59946912.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/, pym/portage/dep/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dep/__init__.py pym/portage/eapi.py X-VCS-Directories: pym/portage/ pym/portage/dep/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 0098ee7395e2c9b35471a5c088eef1fa59946912 X-VCS-Branch: master Date: Sat, 12 May 2012 04:08:05 +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: cce7a7f0-964e-48e9-8905-92bb8c08ed3a X-Archives-Hash: eb24372001b2baf855095e09000449ec commit: 0098ee7395e2c9b35471a5c088eef1fa59946912 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat May 12 04:07:12 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail = com> CommitDate: Sat May 12 04:07:12 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0098ee73 Add portage.eapi.eapi_allows_dots_in_use_flags(). --- pym/portage/dep/__init__.py | 22 +++++++++++----------- pym/portage/eapi.py | 3 +++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 6770140..2e3444d 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -39,7 +39,7 @@ portage.proxy.lazyimport.lazyimport(globals(), from portage import _unicode_decode from portage.eapi import eapi_has_slot_deps, eapi_has_src_uri_arrows, \ eapi_has_use_deps, eapi_has_strong_blocks, eapi_has_use_dep_defaults, \ - eapi_has_repo_deps, eapi_allows_dots_in_PN + eapi_has_repo_deps, eapi_allows_dots_in_PN, eapi_allows_dots_in_use_fla= gs from portage.exception import InvalidAtom, InvalidData, InvalidDependStr= ing from portage.localization import _ from portage.versions import catpkgsplit, catsplit, \ @@ -642,8 +642,8 @@ def flatten(mylist): =20 =20 _usedep_re =3D { - "0": re.compile("^(?P[!-]?)(?P[A-Za-z0-9][A-Za-z0-= 9+_@-]*)(?P(\(\+\)|\(\-\))?)(?P[?=3D]?)$"), - "4-python": re.compile("^(?P[!-]?)(?P[A-Za-z0-9][A-Za-z0-= 9+_@.-]*)(?P(\(\+\)|\(\-\))?)(?P[?=3D]?)$"), + "dots_disallowed_in_use_flags": re.compile("^(?P[!-]?)(?P= [A-Za-z0-9][A-Za-z0-9+_@-]*)(?P(\(\+\)|\(\-\))?)(?P[?=3D= ]?)$"), + "dots_allowed_in_use_flags": re.compile("^(?P[!-]?)(?P= [A-Za-z0-9][A-Za-z0-9+_@.-]*)(?P(\(\+\)|\(\-\))?)(?P[?=3D= ]?)$"), } =20 def _get_usedep_re(eapi): @@ -656,10 +656,10 @@ def _get_usedep_re(eapi): @return: A regular expression object that matches valid USE deps for th= e given eapi. """ - if eapi in (None, "4-python",): - return _usedep_re["4-python"] + if eapi is None or eapi_allows_dots_in_use_flags(eapi): + return _usedep_re["dots_allowed_in_use_flags"] else: - return _usedep_re["0"] + return _usedep_re["dots_disallowed_in_use_flags"] =20 class _use_dep(object): =20 @@ -1677,8 +1677,8 @@ def _get_atom_wildcard_re(eapi): return _atom_wildcard_re["dots_disallowed_in_PN"] =20 _useflag_re =3D { - "0": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@-]*$'), - "4-python": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@.-]*$'), + "dots_disallowed_in_use_flags": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@-= ]*$'), + "dots_allowed_in_use_flags": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@.= -]*$'), } =20 def _get_useflag_re(eapi): @@ -1691,10 +1691,10 @@ def _get_useflag_re(eapi): @return: A regular expression object that matches valid USE flags for t= he given eapi. """ - if eapi in (None, "4-python",): - return _useflag_re["4-python"] + if eapi is None or eapi_allows_dots_in_use_flags(eapi): + return _useflag_re["dots_allowed_in_use_flags"] else: - return _useflag_re["0"] + return _useflag_re["dots_disallowed_in_use_flags"] =20 def isvalidatom(atom, allow_blockers=3DFalse, allow_wildcard=3DFalse, al= low_repo=3DFalse): """ diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py index f09052d..79cf891 100644 --- a/pym/portage/eapi.py +++ b/pym/portage/eapi.py @@ -57,3 +57,6 @@ def eapi_has_repo_deps(eapi): =20 def eapi_allows_dots_in_PN(eapi): return eapi in ("4-python",) + +def eapi_allows_dots_in_use_flags(eapi): + return eapi in ("4-python",)