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

The hint to use force is not stdout but also stderr, filter that out for labelclear

Browse Source
This commit is contained in:
Jorge Schrauwen 2017-11-19 11:03:04 +01:00
parent 217a268bdd
commit 97ac9d0793
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/zpool.py
View File

@ -1375,7 +1375,13 @@ def labelclear(device, force=False):
# Bring all specified devices offline
res = __salt__['cmd.run_all'](cmd, python_shell=False)
if res['retcode'] != 0:
ret[device] = res['stderr'] if 'stderr' in res else res['stdout']
## NOTE: skip the "use '-f' hint"
res['stderr'] = res['stderr'].split("\n")
if len(res['stderr']) >= 1:
if res['stderr'][0].startswith("use '-f'"):
del res['stderr'][0]
res['stderr'] = "\n".join(res['stderr'])
ret[device] = res['stderr'] if 'stderr' in res and res['stderr'] else res['stdout']
else:
ret[device] = 'cleared'
return ret