r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fixing versioning

Browse Source
This commit is contained in:
brent s. 2016-12-14 00:52:05 -05:00
parent f437391818
commit 23c6cc7101
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bdisk/host.py
View File

@ -79,14 +79,13 @@ def parseConfig(confs):
config_dict['sync']['tftp'] = config['sync'].getboolean('tftp') config_dict['sync']['tftp'] = config['sync'].getboolean('tftp')
config_dict['rsync']['iso'] = config['rsync'].getboolean('iso') config_dict['rsync']['iso'] = config['rsync'].getboolean('iso')
# Get the version... # Get the version...
# Three possibilities. # Two possibilities.
# e.g. 1 commit after tag with short hash: ['v3.10', '1', 'gb4a5e40'] # e.g. 1 commit after tag with 7-digit object hex: ['v3.10', '1', 'gb4a5e40']
# Or if were sitting on a tag with no commits: ['v3.10']
if config_dict['bdisk']['ver'] == '': if config_dict['bdisk']['ver'] == '':
repo = git.Repo(config_dict['build']['basedir']) repo = git.Repo(config_dict['build']['basedir'])
refs = repo.git.describe(repo.head.commit).split('-') refs = repo.git.describe(repo.head.commit).split('-')
if len(refs) >= 3: if len(refs) >= 2:
config_dict['bdisk']['ver'] = refs[0] + 'r' + refs[2]
elif len(refs) == 2:
config_dict['bdisk']['ver'] = refs[0] + 'r' + refs[1] config_dict['bdisk']['ver'] = refs[0] + 'r' + refs[1]
else: else:
config_dict['bdisk']['ver'] = refs[0] config_dict['bdisk']['ver'] = refs[0]