[actions] fix 'abort' (#8753)
fixes regression introduced in 2eb5e52055
forward the correct arguments to StopExtraction.__init__
instead of logging message and 'extras'
This commit is contained in:
@@ -257,15 +257,21 @@ def action_raise(opts):
|
|||||||
|
|
||||||
|
|
||||||
def action_abort(opts):
|
def action_abort(opts):
|
||||||
return None, util.raises(exception.StopExtraction)
|
def _abort(_):
|
||||||
|
raise exception.StopExtraction(opts or None)
|
||||||
|
return None, _abort
|
||||||
|
|
||||||
|
|
||||||
def action_terminate(opts):
|
def action_terminate(opts):
|
||||||
return None, util.raises(exception.TerminateExtraction)
|
def _terminate(_):
|
||||||
|
raise exception.TerminateExtraction(opts)
|
||||||
|
return None, _terminate
|
||||||
|
|
||||||
|
|
||||||
def action_restart(opts):
|
def action_restart(opts):
|
||||||
return None, util.raises(exception.RestartExtraction)
|
def _restart(_):
|
||||||
|
raise exception.RestartExtraction(opts)
|
||||||
|
return None, _restart
|
||||||
|
|
||||||
|
|
||||||
def action_exit(opts):
|
def action_exit(opts):
|
||||||
@@ -274,7 +280,7 @@ def action_exit(opts):
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def _exit(args):
|
def _exit(_):
|
||||||
raise SystemExit(opts)
|
raise SystemExit(opts)
|
||||||
return None, _exit
|
return None, _exit
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user