upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-09 00:32:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Move ConfiguratorError to errors.py

Browse source
This commit is contained in:
Peter Eckersley 2015-10-17 12:47:05 -07:00
parent f0faf91b82
commit 8d4f414e09
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
letsencrypt/cli.py
View file

@ -304,9 +304,6 @@ def _auth_from_domains(le_client, config, domains, plugins):
return lineage
class ConfiguratorError(TypeError): # pylint: disable=missing-docstring
pass
def set_configurator(previously, now):
"""Setting configurators multiple ways is okay, as long as they all agree"""
if now is None:
@ -315,7 +312,7 @@ def set_configurator(previously, now):
if previously:
if previously != now:
msg = "Too many flags setting configurators/installers/authenticators %s -> %s"
raise ConfiguratorError, msg % (`previously`, `now`)
raise errors.ConfiguratorError, msg % (`previously`, `now`)
return now
def diagnose_configurator_problem(cfg_type, requested):
@ -329,12 +326,12 @@ def diagnose_configurator_problem(cfg_type, requested):
if requested:
if requested not in plugins:
msg = "The requested " + requested + " plugin does not appear to be installed"
raise ConfiguratorError, msg
raise errors.ConfiguratorError, msg
else:
msg = "The " + requested + " plugin is not working; there may be problems "
msg += "with your existing configuration"
raise ConfiguratorError, msg
raise ConfiguratorError, cfg_type + " could not be determined or is not installed"
raise errors.ConfiguratorError, msg
raise errors.ConfiguratorError, cfg_type + " could not be determined or is not installed"
@ -387,7 +384,7 @@ def run(args, config, plugins): # pylint: disable=too-many-branches,too-many-lo
"""Obtain a certificate and install."""
try:
installer, authenticator = choose_configurator_plugins(args, config, plugins, "run")
except ConfiguratorError, e:
except errors.ConfiguratorError, e:
return e.message
domains = _find_domains(args, installer)

2
letsencrypt/errors.py
View file

@ -24,6 +24,8 @@ class SubprocessError(Error):
class CertStorageError(Error):
"""Generic `.CertStorage` error."""
class ConfiguratorError(Error):
"""A problem with plugin/configurator selection or setup"""
# Auth Handler Errors
class AuthorizationError(Error):