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

Merge pull request #29531 from jfindlay/suse_patch

Browse source 
grains.core: handle undefined variable
This commit is contained in:
Mike Place 2015-12-08 14:07:37 -07:00
commit 3de61e3655
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/grains/core.py
View file

@ -1179,6 +1179,8 @@ def os_data():
grains['lsb_distrib_codename'] = os_release['PRETTY_NAME']
elif os.path.isfile('/etc/SuSE-release'):
grains['lsb_distrib_id'] = 'SUSE'
version = ''
patch = ''
with salt.utils.fopen('/etc/SuSE-release') as fhr:
for line in fhr:
if 'enterprise' in line.lower():
@ -1187,7 +1189,9 @@ def os_data():
version = re.sub(r'[^0-9]', '', line)
elif 'patchlevel' in line.lower():
patch = re.sub(r'[^0-9]', '', line)
grains['lsb_distrib_release'] = version + ' SP' + patch
grains['lsb_distrib_release'] = version
if patch:
grains['lsb_distrib_release'] += ' SP' + patch
grains['lsb_distrib_codename'] = 'n.a'
elif os.path.isfile('/etc/altlinux-release'):
# ALT Linux