[mod] check that os.system didn't failed

This commit is contained in:
Laurent Peuch 2016-05-13 04:03:11 +02:00
parent 98a629ebbd
commit 67041e2680

View file

@ -156,7 +156,7 @@ def domain_add(auth, domain, dyndns=False):
with open('/etc/yunohost/installed', 'r') as f: with open('/etc/yunohost/installed', 'r') as f:
service_regen_conf(names=[ service_regen_conf(names=[
'nginx', 'metronome', 'dnsmasq', 'rmilter']) 'nginx', 'metronome', 'dnsmasq', 'rmilter'])
os.system('yunohost app ssowatconf > /dev/null 2>&1') assert os.system('yunohost app ssowatconf > /dev/null 2>&1') == 0, "SSOwat conf regen failed"
except IOError: pass except IOError: pass
except: except:
# Force domain removal silently # Force domain removal silently
@ -202,6 +202,7 @@ def domain_remove(auth, domain, force=False):
service_regen_conf(names=['nginx', 'metronome', 'dnsmasq']) service_regen_conf(names=['nginx', 'metronome', 'dnsmasq'])
os.system('yunohost app ssowatconf > /dev/null 2>&1') os.system('yunohost app ssowatconf > /dev/null 2>&1')
assert os.system('yunohost app ssowatconf > /dev/null 2>&1') == 0, "SSOwat conf regen failed"
hook_callback('post_domain_remove', args=[domain]) hook_callback('post_domain_remove', args=[domain])