saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

parse minorrelease if it has a / in it

Browse source
This commit is contained in:
Super-User 2016-11-04 17:15:37 +01:00
parent d1cf4a0e56
commit 69706d32be
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/grains/core.py
View file

@ -1458,11 +1458,15 @@ def os_data():
osname = ' '.join((osname, development))
uname_v = os.uname()[3]
grains['os'] = grains['osfullname'] = osname
osrelease = []
osrelease.append(osmajorrelease)
if '/' in osminorrelease:
osrelease.append(osminorrelease.split('/')[0])
osrelease.append(osminorrelease.split('/')[1])
else:
osrelease.append(osminorrelease)
grains['osrelease'] = ".".join(osrelease)
grains['osrelease_stamp'] = uname_v
grains['osrelease'] = ".".join([
osmajorrelease,
osminorrelease,
])
grains.update(_sunos_cpudata())
elif grains['kernel'] == 'VMkernel':