valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2580 from s0undt3ch/develop

Browse Source 
Handle `__version_info__` when local git tags are not up to date.
This commit is contained in:
Thomas S Hatch 2012-11-16 07:51:35 -08:00
commit 8a61fae3db
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
salt/version.py
View File

@ -26,10 +26,27 @@ try:
)
out, err = p.communicate()
if out:
__version__ = '{0}'.format(out.strip().lstrip('v'))
__version_info__ = tuple(
[int(i) for i in __version__.split('-', 1)[0].split('.')]
parsed_version = '{0}'.format(out.strip().lstrip('v'))
parsed_version_info = tuple(
[int(i) for i in parsed_version.split('-', 1)[0].split('.')]
)
if parsed_version_info != __version_info__:
msg = ('In order to get the proper salt version with the git '
'hash you need to update salt\'s local git tags. '
'Something like: \'git fetch --tags\' or '
'\'git fetch --tags upstream\' if you followed '
'salt\'s contribute documentation. The version string '
'WILL NOT include the git hash.')
from salt import log
if log.is_console_configured():
import logging
logging.getLogger(__name__).warning(msg)
else:
sys.stderr.write('WARNING: {0}\n'.format(msg))
else:
__version__ = parsed_version
__version_info__ = parsed_version_info
except Exception:
pass