8000 Preserve the original inhibitor detection valid for now by pirat89 · Pull Request #781 · oamg/leapp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Preserve the original inhibitor detection valid for now #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2022
Merged

Preserve the original inhibitor detection valid for now #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions leapp/reporting/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@ def _create_report_object(entries):
_sanitize_entries(entries)
for entry in entries:
entry.apply(report)
if Groups.INHIBITOR in report.get('groups', []):
# Before removing Flags, the original inhibitor detection worked
# by checking the `flags` field; keep the `flags` field until we drop Flags completely
# Currently we know that 'flags' does not exist otherwise so it's
# safe to just set it
report['flags'] = [Groups.INHIBITOR]

return Report(report=report)

Expand Down
11 changes: 11 additions & 0 deletions leapp/utils/report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,15 @@ def generate_report_file(messages_to_report, context, path, report_schema='1.1.0
groups = msg.pop('groups', [])
msg['flags'] = [g for g in groups if g in _DEPRECATION_FLAGS]
msg['tags'] = [g for g in groups if g not in _DEPRECATION_FLAGS]
if report_schema_tuple == (1, 2, 0):
# DEPRECATED: flags, tags
# NOTE(pstodulk): This is a temporary solution to ensure that
# flags are not present in the JSON output as we need to re-introduce
# flags internally to ensure that any inhibitor checks will not
# be negatively affected until we drop flags and tags completely.
messages_to_report = list(messages_to_report)
for msg in messages_to_report:
# NOTE(ivasilev) As flags field is created only if there is an inhibitor
# a default value to pop has to be specified not to end up with a KeyError
msg.pop('flags', None)
json.dump({'entries': messages_to_report, 'leapp_run_id': context}, f, indent=2)
0