Merge pull request #23144 from rallytime/bp-23124-2014-7

Backport #23124 to 2014.7
This commit is contained in:
Justin Findlay 2015-04-28 14:44:46 -06:00
commit c85d36fd29

View file

@ -154,7 +154,7 @@ def list_(device, unit=None):
else:
cmd = 'parted -m -s {0} print'.format(device)
out = __salt__['cmd.run'](cmd).splitlines()
out = __salt__['cmd.run_stdout'](cmd).splitlines()
ret = {'info': {}, 'partitions': {}}
mode = 'info'
for line in out: