From be1514e2bbb8027a4c0334a66bf8368ecc653b68 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Mon, 4 Mar 2013 15:21:43 +0200 Subject: [PATCH 2/2] Fix parsing a ~dfsg version Consider '~dfsg' a "feature" string. This allows parsing version strings such as "1.8.13.1~dfsg-2" --- lib/python/asterisk/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/python/asterisk/version.py b/lib/python/asterisk/version.py index de6374b..4f67ebd 100644 --- a/lib/python/asterisk/version.py +++ b/lib/python/asterisk/version.py @@ -29,7 +29,7 @@ class AsteriskVersion: This class handles Asterisk version strings. """ - supported_features = [ 'cert', 'digiumphones' ] + supported_features = [ 'cert', 'digiumphones', 'dfsg' ] supported_modifiers = [ 'rc', 'beta' ] @@ -104,7 +104,7 @@ class AsteriskVersion: raw_version = raw_version.replace('Asterisk ', '') - tokens = raw_version.split('-') + tokens = re.split('[-~]', raw_version) count = 0 while (count < len(tokens)): token = tokens[count] -- 1.7.10.4