mirror of
https://github.com/YunoHost/moulinette.git
synced 2024-09-03 20:06:31 +02:00
Fix PID issue
This commit is contained in:
parent
8ca9f69691
commit
8cd358e358
1 changed files with 8 additions and 5 deletions
13
yunohost.tac
13
yunohost.tac
|
@ -116,9 +116,10 @@ def http_exec(request, **kwargs):
|
|||
with open('/var/run/yunohost.pid', 'r'):
|
||||
raise YunoHostError(1, _("A YunoHost command is already running"))
|
||||
except IOError:
|
||||
with open('/var/run/yunohost.pid', 'w') as f:
|
||||
f.write('ldap')
|
||||
os.system('chmod 400 /var/run/yunohost.pid')
|
||||
if dict['function'].split('.')[1] != 'tools_postinstall':
|
||||
with open('/var/run/yunohost.pid', 'w') as f:
|
||||
f.write('ldap')
|
||||
os.system('chmod 400 /var/run/yunohost.pid')
|
||||
with open('/etc/yunohost/passwd', 'w') as f:
|
||||
f.write(request.getPassword())
|
||||
os.system('chmod 400 /etc/yunohost/passwd')
|
||||
|
@ -127,8 +128,10 @@ def http_exec(request, **kwargs):
|
|||
except KeyboardInterrupt, EOFError:
|
||||
raise YunoHostError(125, _("Interrupted"))
|
||||
finally:
|
||||
os.remove('/etc/yunohost/passwd')
|
||||
os.remove('/var/run/yunohost.pid')
|
||||
try:
|
||||
os.remove('/etc/yunohost/passwd')
|
||||
os.remove('/var/run/yunohost.pid')
|
||||
except: pass
|
||||
if result is None:
|
||||
result = {}
|
||||
if len(yunohost.win) > 0:
|
||||
|
|
Loading…
Reference in a new issue