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

yunohost.domain: Fix domain removing if app has no 'domain' setting

Browse source
This commit is contained in:
Jerome Lebleu 2014-04-01 14:43:43 +02:00
parent d766ed5a5e
commit 30d6ace802
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/yunohost/domain.py
View file

@ -256,8 +256,13 @@ def domain_remove(auth, domains):
# Check if apps are installed on the domain # Check if apps are installed on the domain
for app in os.listdir('/etc/yunohost/apps/'): for app in os.listdir('/etc/yunohost/apps/'):
with open('/etc/yunohost/apps/' + app +'/settings.yml') as f: with open('/etc/yunohost/apps/' + app +'/settings.yml') as f:
if yaml.load(f)['domain'] == domain: try:
raise MoulinetteError(1, _("One or more apps are installed on this domain, please uninstall them before proceed to domain removal")) app_domain = yaml.load(f)['domain']
except:
continue
else:
if app_domain == domain:
raise MoulinetteError(1, _("One or more apps are installed on this domain, please uninstall them before proceed to domain removal"))
if auth.remove('virtualdomain=' + domain + ',ou=domains'): if auth.remove('virtualdomain=' + domain + ',ou=domains'):
try: try: