cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mysql_user: fix regression (#55292)

Browse source
This commit is contained in:
Benjamin MALYNOVYTCH 2019-05-06 16:25:43 +02:00 committed by René Moser
parent 7d5ada7161
commit f90398a31d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/mysql_user-fix-versions-compatibilities-regression.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "mysql_user: fix regression introduced when fixing MariaDB/MySQL multiple versions handling"

2
lib/ansible/modules/database/mysql/mysql_user.py
View file

@ -479,7 +479,7 @@ def privileges_get(cursor, user, host):
return x return x
for grant in grants: for grant in grants:
res = re.match("""GRANT (.+) ON (.+) TO (['`"]).*\\3@(['`"]).*\\4( IDENTIFIED BY PASSWORD (['`"]).+\5)? ?(.*)""", grant[0]) res = re.match("""GRANT (.+) ON (.+) TO (['`"]).*\\3@(['`"]).*\\4( IDENTIFIED BY PASSWORD (['`"]).+\\6)? ?(.*)""", grant[0])
if res is None: if res is None:
raise InvalidPrivsError('unable to parse the MySQL grant string: %s' % grant[0]) raise InvalidPrivsError('unable to parse the MySQL grant string: %s' % grant[0])
privileges = res.group(1).split(", ") privileges = res.group(1).split(", ")