diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index 31acca188..9893def33 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -1083,14 +1083,12 @@ class RestoreManager(): return True elif free_space > needed_space: # TODO Add --force options to avoid the error raising - raise MoulinetteError(errno.EIO, - m18n.n('restore_may_be_not_enough_disk_space', + raise MoulinetteError(m18n.n('restore_may_be_not_enough_disk_space', free_space=free_space, needed_space=needed_space, margin=margin)) else: - raise MoulinetteError(errno.EIO, - m18n.n('restore_not_enough_disk_space', + raise MoulinetteError(m18n.n('restore_not_enough_disk_space', free_space=free_space, needed_space=needed_space, margin=margin)) @@ -1143,7 +1141,7 @@ class RestoreManager(): newlines.append(row) except (IOError, OSError, csv.Error) as e: - raise MoulinetteError(errno.EIO,m18n.n('error_reading_file', + raise MoulinetteError(m18n.n('error_reading_file', file=backup_csv, error=str(e))) @@ -2204,9 +2202,8 @@ def backup_info(name, with_details=False, human_readable=False): # Raise exception if link is broken (e.g. on unmounted external storage) if not os.path.exists(archive_file): - raise MoulinetteError(errno.EIO, - m18n.n('backup_archive_broken_link', - path=archive_file)) + raise MoulinetteError('backup_archive_broken_link', + path=archive_file) info_file = "%s/%s.info.json" % (ARCHIVES_PATH, name) diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py index 6c9b890ca..61eeca319 100644 --- a/src/yunohost/certificate.py +++ b/src/yunohost/certificate.py @@ -476,8 +476,7 @@ location ^~ '/.well-known/acme-challenge/' contents = f.read() if '/.well-known/acme-challenge' in contents: - raise MoulinetteError(errno.EINVAL, m18n.n( - 'certmanager_conflicting_nginx_file', filepath=path)) + raise MoulinetteError('certmanager_conflicting_nginx_file', filepath=path) # Write the conf if os.path.exists(nginx_conf_file): diff --git a/src/yunohost/dyndns.py b/src/yunohost/dyndns.py index 09f672662..d9643054e 100644 --- a/src/yunohost/dyndns.py +++ b/src/yunohost/dyndns.py @@ -106,9 +106,8 @@ def _dyndns_available(provider, domain): expected_status_code=None) except MoulinetteError as e: logger.error(str(e)) - raise MoulinetteError(errno.EIO, - m18n.n('dyndns_could_not_check_available', - domain=domain, provider=provider)) + raise MoulinetteError('dyndns_could_not_check_available', + domain=domain, provider=provider) return r == u"Domain %s is available" % domain @@ -130,8 +129,7 @@ def dyndns_subscribe(operation_logger, subscribe_host="dyndns.yunohost.org", dom # Verify if domain is provided by subscribe_host if not _dyndns_provides(subscribe_host, domain): - raise MoulinetteError(errno.ENOENT, - m18n.n('dyndns_domain_not_provided', + raise MoulinetteError(m18n.n('dyndns_domain_not_provided', domain=domain, provider=subscribe_host)) # Verify if domain is available diff --git a/src/yunohost/hook.py b/src/yunohost/hook.py index 302ffe302..fef5199d9 100644 --- a/src/yunohost/hook.py +++ b/src/yunohost/hook.py @@ -255,8 +255,7 @@ def hook_callback(action, hooks=[], args=None, no_trace=False, chdir=None, try: hl = hooks_names[n] except KeyError: - raise MoulinetteError(errno.EINVAL, - m18n.n('hook_name_unknown', n)) + raise MoulinetteError('hook_name_unknown', n) # Iterate over hooks with this name for h in hl: # Update hooks dict diff --git a/src/yunohost/service.py b/src/yunohost/service.py index 2c85b7047..14d16a73d 100644 --- a/src/yunohost/service.py +++ b/src/yunohost/service.py @@ -431,9 +431,8 @@ def service_regen_conf(operation_logger, names=[], with_diff=False, force=False, names = pre_result['succeed'].keys() if not names: - raise MoulinetteError(errno.EIO, - m18n.n('service_regenconf_failed', - services=', '.join(pre_result['failed']))) + raise MoulinetteError('service_regenconf_failed', + services=', '.join(pre_result['failed'])) # Set the processing method _regen = _process_regen_conf if not dry_run else lambda *a, **k: True diff --git a/src/yunohost/settings.py b/src/yunohost/settings.py index d49c1af35..ca9a98561 100644 --- a/src/yunohost/settings.py +++ b/src/yunohost/settings.py @@ -54,7 +54,7 @@ def settings_get(key, full=False): settings = _get_settings() if key not in settings: - raise MoulinetteError(errno.EINVAL, m18n.n( + raise MoulinetteError(m18n.n( 'global_settings_key_doesnt_exists', settings_key=key)) if full: @@ -89,9 +89,8 @@ def settings_set(key, value): if key_type == "bool": if not isinstance(value, bool): - raise MoulinetteError(errno.EINVAL, m18n.n( - 'global_settings_bad_type_for_setting', setting=key, - received_type=type(value).__name__, expected_type=key_type)) + raise MoulinetteError('global_settings_bad_type_for_setting', setting=key, + received_type=type(value).__name__, expected_type=key_type) elif key_type == "int": if not isinstance(value, int) or isinstance(value, bool): if isinstance(value, str): @@ -102,24 +101,21 @@ def settings_set(key, value): 'global_settings_bad_type_for_setting', setting=key, received_type=type(value).__name__, expected_type=key_type)) else: - raise MoulinetteError(errno.EINVAL, m18n.n( - 'global_settings_bad_type_for_setting', setting=key, + raise MoulinetteError(m18n.n('global_settings_bad_type_for_setting', setting=key, received_type=type(value).__name__, expected_type=key_type)) elif key_type == "string": if not isinstance(value, basestring): - raise MoulinetteError(errno.EINVAL, m18n.n( - 'global_settings_bad_type_for_setting', setting=key, + raise MoulinetteError(m18n.n('global_settings_bad_type_for_setting', setting=key, received_type=type(value).__name__, expected_type=key_type)) elif key_type == "enum": if value not in settings[key]["choices"]: - raise MoulinetteError(errno.EINVAL, m18n.n( + raise MoulinetteError(m18n.n( 'global_settings_bad_choice_for_enum', setting=key, received_type=type(value).__name__, expected_type=", ".join(settings[key]["choices"]))) else: - raise MoulinetteError(errno.EINVAL, m18n.n( - 'global_settings_unknown_type', setting=key, - unknown_type=key_type)) + raise MoulinetteError('global_settings_unknown_type', setting=key, + unknown_type=key_type) settings[key]["value"] = value @@ -213,7 +209,7 @@ def _get_settings(): setting_key=key)) unknown_settings[key] = value except Exception as e: - raise MoulinetteError(errno.EIO, m18n.n('global_settings_cant_open_settings', reason=e), + raise MoulinetteError(m18n.n('global_settings_cant_open_settings', reason=e), exc_info=1) if unknown_settings: @@ -235,14 +231,12 @@ def _save_settings(settings, location=SETTINGS_PATH): try: result = json.dumps(settings_without_description, indent=4) except Exception as e: - raise MoulinetteError(errno.EINVAL, - m18n.n('global_settings_cant_serialize_settings', reason=e), + raise MoulinetteError(m18n.n('global_settings_cant_serialize_settings', reason=e), exc_info=1) try: with open(location, "w") as settings_fd: settings_fd.write(result) except Exception as e: - raise MoulinetteError(errno.EIO, - m18n.n('global_settings_cant_write_settings', reason=e), + raise MoulinetteError(m18n.n('global_settings_cant_write_settings', reason=e), exc_info=1) diff --git a/src/yunohost/user.py b/src/yunohost/user.py index c6752d2dc..78bfbf047 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -145,8 +145,7 @@ def user_create(operation_logger, auth, username, firstname, lastname, mail, pas # Check that the mail domain exists if mail.split("@")[1] not in domain_list(auth)['domains']: - raise MoulinetteError(errno.EINVAL, - m18n.n('mail_domain_unknown', + raise MoulinetteError(m18n.n('mail_domain_unknown', domain=mail.split("@")[1])) operation_logger.start() @@ -325,8 +324,7 @@ def user_update(operation_logger, auth, username, firstname=None, lastname=None, ] auth.validate_uniqueness({'mail': mail}) if mail[mail.find('@') + 1:] not in domains: - raise MoulinetteError(errno.EINVAL, - m18n.n('mail_domain_unknown', + raise MoulinetteError(m18n.n('mail_domain_unknown', domain=mail[mail.find('@') + 1:])) if mail in aliases: raise MoulinetteError(errno.EEXIST,m18n.n('mail_unavailable')) @@ -340,8 +338,7 @@ def user_update(operation_logger, auth, username, firstname=None, lastname=None, for mail in add_mailalias: auth.validate_uniqueness({'mail': mail}) if mail[mail.find('@') + 1:] not in domains: - raise MoulinetteError(errno.EINVAL, - m18n.n('mail_domain_unknown', + raise MoulinetteError(m18n.n('mail_domain_unknown', domain=mail[mail.find('@') + 1:])) user['mail'].append(mail) new_attr_dict['mail'] = user['mail']