Skip to content

Commit

Permalink
CLI: Use new Leapp output APIs - reports summary better
Browse files Browse the repository at this point in the history
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
  • Loading branch information
matejmatuska authored and pirat89 committed Jul 17, 2023
1 parent f9eef56 commit f1df664
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ disable=
no-member,
no-name-in-module,
raising-bad-type,
redundant-keyword-arg, # it's one or the other, this one is not so bad at all
# "W" Warnings for stylistic problems or minor programming issues
no-absolute-import,
arguments-differ,
Expand Down
3 changes: 2 additions & 1 deletion commands/preupgrade/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ def preupgrade(args, breadcrumbs):
report_inhibitors(context)
report_files = util.get_cfg_files('report', cfg)
log_files = util.get_cfg_files('logs', cfg)
report_info(report_files, log_files, answerfile_path, fail=workflow.failure)
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure)

if workflow.failure:
sys.exit(1)

Expand Down
2 changes: 1 addition & 1 deletion commands/upgrade/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def upgrade(args, breadcrumbs):
util.generate_report_files(context, report_schema)
report_files = util.get_cfg_files('report', cfg)
log_files = util.get_cfg_files('logs', cfg)
report_info(report_files, log_files, answerfile_path, fail=workflow.failure)
report_info(context, report_files, log_files, answerfile_path, fail=workflow.failure)

if workflow.failure:
sys.exit(1)
Expand Down
2 changes: 1 addition & 1 deletion packaging/leapp-repository.spec
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Requires: leapp-repository-dependencies = %{leapp_repo_deps}

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

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

0 comments on commit f1df664

Please sign in to comment.