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 #30160 from saltstack/aix_dskusage

Browse source 
Fix parsing disk usage for line with no number and AIX values in Kilos
This commit is contained in:
Colton Myers 2016-01-06 09:34:45 -07:00
commit ec009a6812
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/modules/disk.py
View file

@ -68,6 +68,8 @@ def usage(args=None):
cmd = 'df -P'
elif __grains__['kernel'] == 'OpenBSD':
cmd = 'df -kP'
elif __grains__['kernel'] == 'AIX':
cmd = 'df -kP'
else:
cmd = 'df'
if flags:
@ -88,9 +90,11 @@ def usage(args=None):
continue
else:
oldline = None
while not comps[1].isdigit():
while len(comps) >= 2 and not comps[1].isdigit():
comps[0] = '{0} {1}'.format(comps[0], comps[1])
comps.pop(1)
if len(comps) < 2:
continue
try:
if __grains__['kernel'] == 'Darwin':
ret[comps[8]] = {