mysql_user: handle unnecessary GRANT revocation
This commit is contained in:
parent
813d2335ad
commit
cc8fbe34f2
1 changed files with 7 additions and 1 deletions
|
@ -213,7 +213,13 @@ def privileges_revoke(cursor, user,host,db_table):
|
||||||
query = "REVOKE ALL PRIVILEGES ON %s FROM '%s'@'%s'" % (db_table,user,host)
|
query = "REVOKE ALL PRIVILEGES ON %s FROM '%s'@'%s'" % (db_table,user,host)
|
||||||
cursor.execute(query)
|
cursor.execute(query)
|
||||||
query = "REVOKE GRANT OPTION ON %s FROM '%s'@'%s'" % (db_table,user,host)
|
query = "REVOKE GRANT OPTION ON %s FROM '%s'@'%s'" % (db_table,user,host)
|
||||||
cursor.execute(query)
|
try:
|
||||||
|
cursor.execute(query)
|
||||||
|
except MySQLdb.OperationalError, e:
|
||||||
|
# 1141 -> There is no such grant defined for user ... on host ...
|
||||||
|
# If this exception is raised, there is no need to revoke the GRANT privilege
|
||||||
|
if e.args[0] != 1141 or not e.args[1].startswith("There is no such grant defined for user"):
|
||||||
|
raise e
|
||||||
|
|
||||||
def privileges_grant(cursor, user,host,db_table,priv):
|
def privileges_grant(cursor, user,host,db_table,priv):
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue