Skip to content
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

Jump to bottom

Update zabbix module to avoid exception #51038

Closed
wants to merge 2 commits into from
Closed

Update zabbix module to avoid exception #51038

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
907a83c
Update zabbix.py
thechile Jan 3, 2019
c59a108
Merge branch 'develop' into develop
dwoz Feb 13, 2019
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
2 changes: 1 addition & 1 deletion salt/modules/zabbix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2426,7 +2426,7 @@ def run_query(method, params, **kwargs):
ret = _query(method, params, conn_args['url'], conn_args['auth'])
if isinstance(ret['result'], bool):
return ret['result']
return ret['result'] if ret['result'] else False
return ret['result'] if (ret['result'] == True or len(ret['result']) > 0) else False
Copy link
Contributor

@mchugh19 mchugh19 Jun 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be lint proper this should probably read something like:
return ret['result'] if (salt.utils.data.is_true(ret['result']) or len(ret['result']) > 0) else False

else:
raise KeyError
except KeyError:
Expand Down