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

Fix handling of lsb_release info in Debian

Browse Source 
Debian's lsb_release.get_distro_information() returns a dict with keys
missing the leading 'DISTRIB_' found in /etc/lsb-release. This causes
the values to be assigned to grains like lsb_id, lsb_release,
lsb_codename, etc. instead of lsb_distrib_id, lsb_distrib_release,
lsb_distrib_codename as the later grains code expects to find. As I am
not sure if this is a change in the return data for
lsb_release.get_distro_information(), this commit should preserve
backwards compatibility by only inserting 'distrib_' into the grain's
name if it was not already present.
This commit is contained in:
Erik Johnson 2013-07-21 14:18:27 -05:00
parent 2a4a88447c
commit f4c4e2ecd4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/grains/core.py
View File

@ -686,7 +686,12 @@ def os_data():
import lsb_release
release = lsb_release.get_distro_information()
for key, value in release.iteritems():
grains['lsb_{0}'.format(key.lower())] = value # override /etc/lsb-release
key = key.lower()
lsb_param = 'lsb_{0}{1}'.format(
'' if key.startswith('distrib_') else 'distrib_',
key
)
grains[lsb_param] = value
except ImportError:
# if the python library isn't available, default to regex
if os.path.isfile('/etc/lsb-release'):