valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix lint error comparisons with None

Browse Source
This commit is contained in:
Christophe Drevet-Droguet 2014-02-28 12:03:38 +01:00
parent 5bffb207de
commit 715e9345a0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/mysql_query.py
View File

@ -93,7 +93,7 @@ def run(name,
# Check if execution needed
if output == 'grain':
if grain != None and key == None:
if grain is not None and key is None:
if not overwrite and grain in __salt__['grains.ls']():
ret['comment'] = 'No execution needed. Grain ' + grain\
+ ' already set'
@ -103,7 +103,7 @@ def run(name,
ret['comment'] = 'Query would execute, storing result in '\
+ 'grain: ' + grain
return ret
elif grain != None and key != None:
elif grain is not None:
if grain in __salt__['grains.ls']():
grain_value = __salt__['grains.get'](grain)
else:
@ -150,11 +150,11 @@ def run(name,
ret['comment'] = query_result
if output == 'grain':
if grain != None and key == None:
if grain is not None and key is None:
__salt__['grains.setval'](grain, query_result)
ret['changes']['query'] = "Executed. Output into grain: "\
+ grain
elif grain != None and key != None:
elif grain is not None:
if grain in __salt__['grains.ls']():
grain_value = __salt__['grains.get'](grain)
else: