diff options
Diffstat (limited to 'debian/lib/python/debian_linux/debian.py')
| -rw-r--r-- | debian/lib/python/debian_linux/debian.py | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py index 96434b0492a5..7b6e9ba101be 100644 --- a/debian/lib/python/debian_linux/debian.py +++ b/debian/lib/python/debian_linux/debian.py @@ -69,22 +69,17 @@ def parse_version_linux(version): version_re = ur""" ^ (?P<source> - (?P<parent> - \d+\.\d+\.\d+\+ - )? - (?P<upstream> - (?P<version> - (?P<major>\d+\.\d+) - \. - \d+ - ) - (?: - - - (?P<modifier> - .+? - ) - )? + (?P<version> + (?P<major>\d+\.\d+) + \. + \d+ ) + (?: + ~ + (?P<modifier> + .+? + ) + )? - (?P<debian>[^-]+) ) @@ -94,10 +89,12 @@ $ if match is None: raise ValueError ret = match.groupdict() - if ret['parent'] is not None: - ret['source_upstream'] = ret['parent'] + ret['upstream'] + if ret['modifier'] is not None: + ret['upstream'] = '%s-%s' % (ret['version'], ret['modifier']) + ret['source_upstream'] = '%s~%s' % (ret['version'], ret['modifier']) else: - ret['source_upstream'] = ret['upstream'] + ret['upstream'] = ret['version'] + ret['source_upstream'] = ret['version'] return ret class package_description(object): |