| 1 |
commit: b934d0728451c9c6127edcbfc40d5d28730c64a4 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Thu Jul 19 16:24:48 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Thu Jul 19 16:24:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b934d072 |
| 7 |
|
| 8 |
handle versions correctly that start with a dot |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/depres/depenv.py | 10 +++++++--- |
| 12 |
1 files changed, 7 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py |
| 15 |
index 7cef1c9..69e9d57 100644 |
| 16 |
--- a/roverlay/depres/depenv.py |
| 17 |
+++ b/roverlay/depres/depenv.py |
| 18 |
@@ -73,12 +73,16 @@ class DepEnv ( object ): |
| 19 |
m = r.match ( self.dep_str_low ) |
| 20 |
if m is not None: |
| 21 |
|
| 22 |
+ version = self.__class__.FIXVERSION_REGEX.sub ( |
| 23 |
+ '.', m.group ( 'ver' ) |
| 24 |
+ ) |
| 25 |
+ # fix versions like ".9" (-> "0.9") |
| 26 |
+ if version [0] == '.': version = '0' + version |
| 27 |
+ |
| 28 |
result.append ( dict ( |
| 29 |
name = m.group ( 'name' ), |
| 30 |
version_modifier = m.group ( 'vmod' ), |
| 31 |
- version = self.__class__.FIXVERSION_REGEX.sub ( |
| 32 |
- '.', m.group ( 'ver' ) |
| 33 |
- ) |
| 34 |
+ version = version |
| 35 |
) ) |
| 36 |
|
| 37 |
if not self.try_all_regexes: break |
Archives