From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2073B13800E for ; Mon, 30 Jul 2012 08:54:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89056E06F7; Mon, 30 Jul 2012 08:52:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5C811E06F7 for ; Mon, 30 Jul 2012 08:52:49 +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 A9E411B400A for ; Mon, 30 Jul 2012 08:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C334FE5453 for ; Mon, 30 Jul 2012 08:52:46 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1343637846.6a2487574fcf8b40f42b9e3046976b3ca0658195.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/depres/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/depres/depenv.py X-VCS-Directories: roverlay/depres/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 6a2487574fcf8b40f42b9e3046976b3ca0658195 X-VCS-Branch: master Date: Mon, 30 Jul 2012 08:52:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c567fb41-23e8-4555-9d5e-68c9bc3fe939 X-Archives-Hash: 9cc38f24a276833f2a738cd428a3e035 Message-ID: <20120730085246.OqedqCSKMu2KTobULAsP6M22LCJ65f0hJebBfsr516k@z> commit: 6a2487574fcf8b40f42b9e3046976b3ca0658195 Author: André Erdmann mailerd de> AuthorDate: Mon Jul 30 08:44:06 2012 +0000 Commit: André Erdmann mailerd de> CommitDate: Mon Jul 30 08:44:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6a248757 unquote dep strings, accept == version modifier --- roverlay/depres/depenv.py | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py index 69e9d57..e70c6d3 100644 --- a/roverlay/depres/depenv.py +++ b/roverlay/depres/depenv.py @@ -2,14 +2,18 @@ # Copyright 2006-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import re +from roverlay import strutil class DepEnv ( object ): # excluding A-Z since dep_str_low will be used to find a match - _NAME = '(?P[a-z0-9_\-/]+)' + _NAME = '(?P[a-z0-9_\-/.+-]+)' _VER = '(?P[0-9._\-]+)' - # { <, >, <=, >=, =, != } (TODO !=) - _VERMOD = '(?P[<>]|[<>!]?[=])' + # { <, >, ==, <=, >=, =, != } (TODO !=) + _VERMOD = '(?P[<>]|[=<>!]?[=])' + + # FIXME: "boost library (>1.0)" not resolved as >=dev-libs/boost-1.0, + # regex \s V_REGEX_STR = frozenset ( ( # 'R >= 2.15', 'R >=2.15' etc. (but not 'R>=2.15'!) @@ -52,8 +56,8 @@ class DepEnv ( object ): * dep_str -- dependency string at it appears in the description data. """ self.deptype_mask = deptype_mask - self.dep_str = dep_str - self.dep_str_low = dep_str.lower() + self.dep_str = strutil.unquote ( dep_str ) + self.dep_str_low = self.dep_str.lower() self.status = DepEnv.STATUS_UNDONE self.resolved_by = None @@ -79,9 +83,12 @@ class DepEnv ( object ): # fix versions like ".9" (-> "0.9") if version [0] == '.': version = '0' + version + vmod = m.group ( 'vmod' ) + if vmod == '==' : vmod = '=' + result.append ( dict ( name = m.group ( 'name' ), - version_modifier = m.group ( 'vmod' ), + version_modifier = vmod, version = version ) )