diff options
| author |   André Erdmann <dywi@mailerd.de> | 2012-07-30 10:44:06 +0200 |
|---|---|---|
| committer | André Erdmann <dywi@mailerd.de> | 2012-07-30 10:44:06 +0200 |
| commit | 6a2487574fcf8b40f42b9e3046976b3ca0658195 (patch) | |
| tree | 3d4b7ce52236173f9926c08bd18227e7b2cb0d44 /roverlay/depres/depenv.py | |
| parent | fix _write call (diff) | |
| download | R_overlay-6a2487574fcf8b40f42b9e3046976b3ca0658195.tar.gz R_overlay-6a2487574fcf8b40f42b9e3046976b3ca0658195.tar.bz2 R_overlay-6a2487574fcf8b40f42b9e3046976b3ca0658195.zip | |
unquote dep strings, accept == version modifier
Diffstat (limited to 'roverlay/depres/depenv.py')
| -rw-r--r-- | 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<name>[a-z0-9_\-/]+)' + _NAME = '(?P<name>[a-z0-9_\-/.+-]+)' _VER = '(?P<ver>[0-9._\-]+)' - # { <, >, <=, >=, =, != } (TODO !=) - _VERMOD = '(?P<vmod>[<>]|[<>!]?[=])' + # { <, >, ==, <=, >=, =, != } (TODO !=) + _VERMOD = '(?P<vmod>[<>]|[=<>!]?[=])' + + # 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 ) ) |