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

Merge branch 'issue_15195' of https://github.com/cachedout/salt into cachedout-issue_15195

Browse Source
This commit is contained in:
Thomas S Hatch 2014-10-01 15:03:01 -06:00
commit 0340e41ccf
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/mysql.py
View File

@ -280,6 +280,9 @@ def _connect(**kwargs):
# Ensure MySQldb knows the format we use for queries with arguments # Ensure MySQldb knows the format we use for queries with arguments
MySQLdb.paramstyle = 'pyformat' MySQLdb.paramstyle = 'pyformat'
if connargs.get('passwd', True) is None: # If present but set to None. (Extreme edge case.)
log.warning('MySQL password of None found. Attempting passwordless login.')
connargs.pop('passwd')
try: try:
dbc = MySQLdb.connect(**connargs) dbc = MySQLdb.connect(**connargs)
except MySQLdb.OperationalError as exc: except MySQLdb.OperationalError as exc: