Merge pull request #6796 from mistaka0s/mysqldump_fix

Remove extra quote from the mysqldump password argument
reviewable/pr18780/r1
Michael DeHaan 11 years ago
commit acd89f7a1f

@ -124,7 +124,7 @@ def db_delete(cursor, db):
def db_dump(module, host, user, password, db_name, target, port, socket=None): def db_dump(module, host, user, password, db_name, target, port, socket=None):
cmd = module.get_bin_path('mysqldump', True) cmd = module.get_bin_path('mysqldump', True)
cmd += " --quick --user=%s --password='%s'" % (pipes.quote(user), pipes.quote(password)) cmd += " --quick --user=%s --password=%s" % (pipes.quote(user), pipes.quote(password))
if socket is not None: if socket is not None:
cmd += " --socket=%s" % pipes.quote(socket) cmd += " --socket=%s" % pipes.quote(socket)
else: else:
@ -141,7 +141,7 @@ def db_dump(module, host, user, password, db_name, target, port, socket=None):
def db_import(module, host, user, password, db_name, target, port, socket=None): def db_import(module, host, user, password, db_name, target, port, socket=None):
cmd = module.get_bin_path('mysql', True) cmd = module.get_bin_path('mysql', True)
cmd += " --user=%s --password='%s'" % (pipes.quote(user), pipes.quote(password)) cmd += " --user=%s --password=%s" % (pipes.quote(user), pipes.quote(password))
if socket is not None: if socket is not None:
cmd += " --socket=%s" % pipes.quote(socket) cmd += " --socket=%s" % pipes.quote(socket)
else: else:

Loading…
Cancel
Save