Merge pull request #55706 from dwoz/zabbix-exceptiono

Update zabbix module to avoid exception
saltstack · Dec 23, 2019 · 091cbbd · 091cbbd
2 parents a764150 + 37385c2
commit 091cbbd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/salt/modules/zabbix.py b/salt/modules/zabbix.py
@@ -2426,7 +2426,10 @@ def run_query(method, params, **connection_args):
             ret = _query(method, params, conn_args['url'], conn_args['auth'])
             if isinstance(ret['result'], bool):
                 return ret['result']
-            return ret['result'] if len(ret['result']) > 0 else False
+            if ret['result'] is True or len(ret['result']) > 0:
+                return ret['result']
+            else:
+                return False
         else:
             raise KeyError
     except KeyError: