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

Insure num_cpus grains is an int on BSD systems, for consistency with Linux.

Browse source
This commit is contained in:
Joshua Elsasser 2012-07-15 07:37:12 -07:00
parent de41270818
commit c4524819e4
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

@ -124,6 +124,10 @@ def _bsd_cpudata(osdata):
grains = dict([(k, __salt__['cmd.run'](v)) for k, v in cmds.items()])
grains['cpu_flags'] = []
try:
grains['num_cpus'] = int(grains['num_cpus'])
except Exception:
grains['num_cpus'] = 0
return grains