YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] always remove lock if needed

Browse source
This commit is contained in:
Laurent Peuch 2018-05-11 22:57:37 +02:00
parent 7435cfdea3
commit 1d59738085
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/service.py
View file

@ -530,14 +530,17 @@ def _run_service_command(action, service):
PID = _give_lock(action, service, p) PID = _give_lock(action, service, p)
# Wait for the command to complete # Wait for the command to complete
p.communicate() p.communicate()
# Remove the lock if one was given
if need_lock and PID != 0:
_remove_lock(PID)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
# TODO: Log output? # TODO: Log output?
logger.warning(m18n.n('service_cmd_exec_failed', command=' '.join(e.cmd))) logger.warning(m18n.n('service_cmd_exec_failed', command=' '.join(e.cmd)))
return False return False
finally:
# Remove the lock if one was given
if need_lock and PID != 0:
_remove_lock(PID)
return True return True