| 1 |
commit: e27f0b7bfc4555d1ac9720e2545d01c584d318d3 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Sat Aug 23 18:57:52 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Sat Aug 23 18:57:52 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e27f0b7b |
| 7 |
|
| 8 |
roverlay/depres/depenv: skip vmod dict lookup |
| 9 |
|
| 10 |
When checking/normalizing vmod_str, set vmod directly if possible. |
| 11 |
|
| 12 |
--- |
| 13 |
roverlay/depres/depenv.py | 19 ++++++++++++------- |
| 14 |
1 file changed, 12 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py |
| 17 |
index 7d1bf5e..c0ea6e1 100644 |
| 18 |
--- a/roverlay/depres/depenv.py |
| 19 |
+++ b/roverlay/depres/depenv.py |
| 20 |
@@ -218,14 +218,19 @@ class DepEnv ( object ): |
| 21 |
# fix versions like ".9" (-> "0.9") |
| 22 |
if version [0] == '.': version = '0' + version |
| 23 |
|
| 24 |
- vmod = m.group ( 'vmod' ) |
| 25 |
+ vmod_str = m.group ( 'vmod' ) |
| 26 |
|
| 27 |
- if not vmod: |
| 28 |
+ if not vmod_str: |
| 29 |
# version required, but no modifier: set vmod to '>=' |
| 30 |
- vmod = '>=' |
| 31 |
- elif vmod == '==': |
| 32 |
+ vmod = self.VMOD_GE |
| 33 |
+ vmod_str = '>=' |
| 34 |
+ #vmod_weak = True # for slot-resolve // TODO-MAYBE |
| 35 |
+ elif vmod_str == '==': |
| 36 |
# "normalize" |
| 37 |
- vmod = '=' |
| 38 |
+ vmod = self.VMOD_EQ |
| 39 |
+ vmod_str = '=' |
| 40 |
+ else: |
| 41 |
+ vmod = self.VMOD.get ( vmod_str, self.VMOD_UNDEF ) |
| 42 |
|
| 43 |
version_strlist = version.split ( '.' ) |
| 44 |
version_iparts = list() |
| 45 |
@@ -243,13 +248,13 @@ class DepEnv ( object ): |
| 46 |
result.append ( dict ( |
| 47 |
name = m.group ( 'name' ), |
| 48 |
name_low = m.group ( 'name' ).lower(), |
| 49 |
- version_modifier = vmod, |
| 50 |
+ version_modifier = vmod_str, |
| 51 |
version = version, |
| 52 |
version_strlist = version_strlist, |
| 53 |
version_tuple = roverlay.versiontuple.IntVersionTuple ( |
| 54 |
version_iparts |
| 55 |
), |
| 56 |
- vmod = self.VMOD.get ( vmod, self.VMOD_UNDEF ), |
| 57 |
+ vmod = vmod, |
| 58 |
) ) |
| 59 |
|
| 60 |
if not self.try_all_regexes: break |
Archives