Skip to content

Commit d317a29

Browse files
committed
Use new leapp output apis
Leapp introduced new output apis (and removed some other). See oamg/leapp#840 for details.
1 parent 34d4629 commit d317a29

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

commands/preupgrade/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from leapp.logger import configure_logger
1010
from leapp.utils.audit import Execution
1111
from leapp.utils.clicmd import command, command_opt
12-
from leapp.utils.output import beautify_actor_exception, report_errors, report_info, report_inhibitors
12+
from leapp.utils.output import beautify_actor_exception, report_errors, report_info
1313

1414

1515
@command('preupgrade', help='Generate preupgrade report')
@@ -77,10 +77,9 @@ def preupgrade(args, breadcrumbs):
7777
workflow.save_answers(answerfile_path, userchoices_path)
7878
util.generate_report_files(context, report_schema)
7979
report_errors(workflow.errors)
80-
report_inhibitors(context)
8180
report_files = util.get_cfg_files('report', cfg)
8281
log_files = util.get_cfg_files('logs', cfg)
83-
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure)
82+
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure, errors=workflow.errors)
8483

8584
if workflow.failure:
8685
sys.exit(1)

commands/upgrade/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from leapp.logger import configure_logger
1010
from leapp.utils.audit import Execution
1111
from leapp.utils.clicmd import command, command_opt
12-
from leapp.utils.output import beautify_actor_exception, report_errors, report_info, report_inhibitors
12+
from leapp.utils.output import beautify_actor_exception, report_errors, report_info
1313

1414
# NOTE:
1515
# If you are adding new parameters please ensure that they are set in the upgrade function invocation in `rerun`
@@ -106,11 +106,10 @@ def upgrade(args, breadcrumbs):
106106
logger.info("Answerfile will be created at %s", answerfile_path)
107107
workflow.save_answers(answerfile_path, userchoices_path)
108108
report_errors(workflow.errors)
109-
report_inhibitors(context)
110109
util.generate_report_files(context, report_schema)
111110
report_files = util.get_cfg_files('report', cfg)
112111
log_files = util.get_cfg_files('logs', cfg)
113-
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure)
112+
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure, errors=workflow.errors)
114113

115114
if workflow.failure:
116115
sys.exit(1)

0 commit comments

Comments
 (0)