remove some pointless wrapping of exceptions
This commit is contained in:
parent
3d9cbeac95
commit
5dca5e861e
|
@ -20,7 +20,6 @@ import logging
|
|||
from subiquitycore.log import setup_logger
|
||||
from subiquitycore import __version__ as VERSION
|
||||
from console_conf.core import ConsoleConf
|
||||
from subiquitycore.core import ApplicationError
|
||||
from subiquitycore.utils import environment_check
|
||||
|
||||
|
||||
|
@ -87,13 +86,7 @@ def main():
|
|||
'Check {} for errors.'.format(LOGFILE))
|
||||
return 1
|
||||
|
||||
try:
|
||||
interface = ConsoleConf(opts)
|
||||
except ApplicationError as e:
|
||||
logger.exception('Failed to load ConsoleConf interface')
|
||||
print(e)
|
||||
return 1
|
||||
|
||||
interface = ConsoleConf(opts)
|
||||
interface.run()
|
||||
|
||||
|
||||
|
|
|
@ -22,7 +22,6 @@ import sys
|
|||
|
||||
from subiquitycore.log import setup_logger
|
||||
from subiquitycore import __version__ as VERSION
|
||||
from subiquitycore.core import ApplicationError
|
||||
from subiquitycore.utils import environment_check
|
||||
|
||||
from subiquity.core import Subiquity
|
||||
|
@ -144,12 +143,7 @@ def main():
|
|||
opts.answers.close()
|
||||
opts.answers = None
|
||||
|
||||
try:
|
||||
subiquity_interface = Subiquity(opts, block_log_dir)
|
||||
except ApplicationError as e:
|
||||
logger.exception('Failed to load Subiquity interface')
|
||||
print(e)
|
||||
return 1
|
||||
subiquity_interface = Subiquity(opts, block_log_dir)
|
||||
|
||||
subiquity_interface.run()
|
||||
|
||||
|
|
|
@ -34,11 +34,6 @@ from subiquitycore.ui.frame import SubiquityCoreUI
|
|||
log = logging.getLogger('subiquitycore.core')
|
||||
|
||||
|
||||
class ApplicationError(Exception):
|
||||
""" Basecontroller exception """
|
||||
pass
|
||||
|
||||
|
||||
class Skip(Exception):
|
||||
"""Raise this from a controller's default method to skip a screen."""
|
||||
|
||||
|
|
Loading…
Reference in New Issue