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

Merge pull request #9952 from dmyerscough/develop

Browse Source 
Notify the user if dmidecode could not be located
This commit is contained in:
Thomas S Hatch 2014-01-31 09:25:35 -08:00
commit 5e5cd6350c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/grains/core.py
View File

@ -1219,6 +1219,10 @@ def _dmidecode_data(regex_dict):
elif salt.utils.which('smbios'): elif salt.utils.which('smbios'):
out = __salt__['cmd.run']('smbios') out = __salt__['cmd.run']('smbios')
else: else:
log.info(
'The `dmidecode` binary is not available on the system. GPU grains '
'will not be available.'
)
return ret return ret
for section in regex_dict: for section in regex_dict: