Merge pull request #5183 from nicolasnoble/fixing-no-tag

Fixing the absence of 'tag' in the version.
pull/5236/head
Craig Tiller 9 years ago
commit 10a4cc74a1
  1. 6
      tools/buildgen/plugins/expand_version.py

@ -51,6 +51,7 @@ LANGUAGES = [
class Version:
def __init__(self, s):
self.tag = None
if '-' in s:
s, self.tag = s.split('-')
self.major, self.minor, self.patch = [int(x) for x in s.split('.')]
@ -78,7 +79,10 @@ class Version:
def ruby(self):
"""Version string in Ruby style"""
return '%d.%d.%d.%s' % (self.major, self.minor, self.patch, self.tag)
if self.tag:
return '%d.%d.%d.%s' % (self.major, self.minor, self.patch, self.tag)
else:
return '%d.%d.%d' % (self.major, self.minor, self.patch)
def mako_plugin(dictionary):
"""Expand version numbers:

Loading…
Cancel
Save