This commit is contained in:
Justin Findlay 2015-02-20 21:30:09 -07:00 committed by rallytime
parent b0a4e48ec4
commit 213ef3d061

View File

@ -72,20 +72,20 @@ def usage(args=None):
cmd += ' -{0}'.format(flags)
ret = {}
out = __salt__['cmd.run'](cmd, python_shell=False).splitlines()
oldline=None
oldline = None
for line in out:
if not line:
continue
if line.startswith('Filesystem'):
continue
if oldline:
line = oldline + " " + line
line = oldline + " " + line
comps = line.split()
if len(comps) == 1:
oldline=line
continue
oldline = line
continue
else:
oldline=None
oldline = None
while not comps[1].isdigit():
comps[0] = '{0} {1}'.format(comps[0], comps[1])
comps.pop(1)