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

[mod] pep8

Browse source
This commit is contained in:
Laurent Peuch 2016-12-02 23:23:06 +01:00 • committed by Alexandre Aubin
parent 9c798e5d62
commit c468a69754
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/yunohost/domain.py
View file

@ -160,7 +160,7 @@ def domain_remove(auth, domain, force=False):
raise MoulinetteError(errno.EINVAL, m18n.n('domain_unknown'))
# Check domain is not the main domain
if (domain == _get_maindomain()) :
if domain == _get_maindomain():
raise MoulinetteError(errno.EINVAL, m18n.n('domain_cannot_remove_main'))
# Check if apps are installed on the domain
@ -290,6 +290,7 @@ def get_public_ip(protocol=4):
raise MoulinetteError(errno.ENETUNREACH,
m18n.n('no_internet_connection'))
def _get_maindomain():
with open('/etc/yunohost/current_host', 'r') as f:
maindomain = f.readline().rstrip()

3
src/yunohost/tools.py
View file

@ -136,7 +136,7 @@ def tools_maindomain(auth, new_domain=None):
# If no new domain specified, we return the current main domain
if not new_domain:
return { 'current_main_domain': _get_maindomain() }
return {'current_main_domain': _get_maindomain()}
# Check domain exists
if new_domain not in domain_list(auth)['domains']:
@ -149,7 +149,6 @@ def tools_maindomain(auth, new_domain=None):
new_ssl_crt = "/etc/yunohost/certs/%s/crt.pem" % new_domain
try:
if os.path.exists(ssl_key) or os.path.lexists(ssl_key) :
os.remove(ssl_key)
if os.path.exists(ssl_crt) or os.path.lexists(ssl_crt) :