Skip to content

Commit ab6c6b4

Browse files
matejmatuskapirat89
authored andcommitted
CLI: Use new Leapp output APIs - reports summary better
The new Leapp output APIs now display better summary about the report. See oamg/leapp#818 for more info. * Require leapp-framework versio 4.0 * Suppress redundant-keyword-arg for pylint pstodulk: we have one error or another and this one is not actually so important from my POV - I would even argue that it's not a bad habit
1 parent f9eef56 commit ab6c6b4

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

.pylintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ disable=
77
no-member,
88
no-name-in-module,
99
raising-bad-type,
10+
redundant-keyword-arg, # it's one or the other, this one is not so bad at all
1011
# "W" Warnings for stylistic problems or minor programming issues
1112
no-absolute-import,
1213
arguments-differ,

commands/preupgrade/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ def preupgrade(args, breadcrumbs):
8080
report_inhibitors(context)
8181
report_files = util.get_cfg_files('report', cfg)
8282
log_files = util.get_cfg_files('logs', cfg)
83-
report_info(report_files, log_files, answerfile_path, fail=workflow.failure)
83+
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure)
84+
8485
if workflow.failure:
8586
sys.exit(1)
8687

commands/upgrade/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def upgrade(args, breadcrumbs):
110110
util.generate_report_files(context, report_schema)
111111
report_files = util.get_cfg_files('report', cfg)
112112
log_files = util.get_cfg_files('logs', cfg)
113-
report_info(report_files, log_files, answerfile_path, fail=workflow.failure)
113+
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure)
114114

115115
if workflow.failure:
116116
sys.exit(1)

packaging/leapp-repository.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Requires: leapp-repository-dependencies = %{leapp_repo_deps}
100100

101101
# IMPORTANT: this is capability provided by the leapp framework rpm.
102102
# Check that 'version' instead of the real framework rpm version.
103-
Requires: leapp-framework >= 3.1, leapp-framework < 4
103+
Requires: leapp-framework >= 4.0, leapp-framework < 5
104104

105105
# Since we provide sub-commands for the leapp utility, we expect the leapp
106106
# tool to be installed as well.

0 commit comments

Comments
 (0)