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] sterror doesn't exist most of the time

Browse source
This commit is contained in:
Laurent Peuch 2019-02-06 19:27:43 +01:00
parent 69a896e1c3
commit 0267a798a7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/yunohost/app.py
View file

@ -1173,7 +1173,7 @@ def app_makedefault(operation_logger, auth, app, domain=None):
with open('/etc/ssowat/conf.json.persistent') as json_conf: with open('/etc/ssowat/conf.json.persistent') as json_conf:
ssowat_conf = json.loads(str(json_conf.read())) ssowat_conf = json.loads(str(json_conf.read()))
except ValueError as e: except ValueError as e:
raise YunohostError('ssowat_persistent_conf_read_error', error=e.strerror) raise YunohostError('ssowat_persistent_conf_read_error', error=e)
except IOError: except IOError:
ssowat_conf = {} ssowat_conf = {}
@ -1186,7 +1186,7 @@ def app_makedefault(operation_logger, auth, app, domain=None):
with open('/etc/ssowat/conf.json.persistent', 'w+') as f: with open('/etc/ssowat/conf.json.persistent', 'w+') as f:
json.dump(ssowat_conf, f, sort_keys=True, indent=4) json.dump(ssowat_conf, f, sort_keys=True, indent=4)
except IOError as e: except IOError as e:
raise YunohostError('ssowat_persistent_conf_write_error', error=e.strerror) raise YunohostError('ssowat_persistent_conf_write_error', error=e)
os.system('chmod 644 /etc/ssowat/conf.json.persistent') os.system('chmod 644 /etc/ssowat/conf.json.persistent')
@ -1824,7 +1824,7 @@ def _extract_app_from_file(path, remove=False):
except IOError: except IOError:
raise YunohostError('app_install_files_invalid') raise YunohostError('app_install_files_invalid')
except ValueError as e: except ValueError as e:
raise YunohostError('app_manifest_invalid', error=e.strerror) raise YunohostError('app_manifest_invalid', error=e)
logger.debug(m18n.n('done')) logger.debug(m18n.n('done'))
@ -1917,7 +1917,7 @@ def _fetch_app_from_git(app):
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise YunohostError('app_sources_fetch_failed') raise YunohostError('app_sources_fetch_failed')
except ValueError as e: except ValueError as e:
raise YunohostError('app_manifest_invalid', error=e.strerror) raise YunohostError('app_manifest_invalid', error=e)
else: else:
logger.debug(m18n.n('done')) logger.debug(m18n.n('done'))
@ -1970,7 +1970,7 @@ def _fetch_app_from_git(app):
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise YunohostError('app_sources_fetch_failed') raise YunohostError('app_sources_fetch_failed')
except ValueError as e: except ValueError as e:
raise YunohostError('app_manifest_invalid', error=e.strerror) raise YunohostError('app_manifest_invalid', error=e)
else: else:
logger.debug(m18n.n('done')) logger.debug(m18n.n('done'))
@ -2250,7 +2250,7 @@ def _parse_action_args_in_yunohost_format(args, action_args, auth=None):
try: try:
user_info(auth, arg_value) user_info(auth, arg_value)
except YunohostError as e: except YunohostError as e:
raise YunohostError('app_argument_invalid', name=arg_name, error=e.strerror) raise YunohostError('app_argument_invalid', name=arg_name, error=e)
elif arg_type == 'app': elif arg_type == 'app':
if not _is_installed(arg_value): if not _is_installed(arg_value):
raise YunohostError('app_argument_invalid', name=arg_name, error=m18n.n('app_unknown')) raise YunohostError('app_argument_invalid', name=arg_name, error=m18n.n('app_unknown'))