diff options
author | Toshio Kuratomi <a.badger@gmail.com> | 2015-05-26 15:32:01 -0700 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2015-05-26 15:32:01 -0700 |
commit | 476af93e96f5d2518470b5c27ece59cbda66ec1d (patch) | |
tree | 6298bf8db0b5091d264607212bba0c9008826270 | |
parent | 0ab2f81d4fd87638a304fa93d5d64831bfa3fca5 (diff) | |
parent | db9ab9b2629f00350a743a4eca72fb5ee8dc8c77 (diff) | |
download | ansible-modules-core-476af93e96f5d2518470b5c27ece59cbda66ec1d.tar.gz |
Merge pull request #1358 from Jmainguy/mysql_user_dots
observe ` in privileges_unpack
-rw-r--r-- | database/mysql/mysql_user.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/database/mysql/mysql_user.py b/database/mysql/mysql_user.py index afebd0a0..a3e24261 100644 --- a/database/mysql/mysql_user.py +++ b/database/mysql/mysql_user.py @@ -320,12 +320,8 @@ def privileges_unpack(priv): output = {} for item in priv.strip().split('/'): pieces = item.strip().split(':') - if '.' in pieces[0]: - pieces[0] = pieces[0].split('.') - for idx, piece in enumerate(pieces): - if pieces[0][idx] != "*": - pieces[0][idx] = "`" + pieces[0][idx] + "`" - pieces[0] = '.'.join(pieces[0]) + dbpriv = pieces[0].rsplit(".", 1) + pieces[0] = "`%s`.%s" % (dbpriv[0].strip('`'), dbpriv[1]) output[pieces[0]] = pieces[1].upper().split(',') new_privs = frozenset(output[pieces[0]]) |