use default value for parameter config_file in connect()

reviewable/pr18780/r1
Sven Schliesing 10 years ago
parent 616ac905ff
commit c53ca2f776

@ -183,11 +183,7 @@ class InvalidPrivsError(Exception):
# MySQL module specific support methods. # MySQL module specific support methods.
# #
def connect(module, login_user, login_password, config_file): def connect(module, login_user, login_password, config_file='~/.my.cnf'):
default_file = '~/.my.cnf'
if config_file is not None:
default_file = config_file
config = { config = {
'host': module.params['login_host'], 'host': module.params['login_host'],
'db': 'mysql' 'db': 'mysql'
@ -198,8 +194,8 @@ def connect(module, login_user, login_password, config_file):
else: else:
config['port'] = module.params['login_port'] config['port'] = module.params['login_port']
if os.path.exists(default_file): if os.path.exists(config_file):
config['read_default_file'] = default_file config['read_default_file'] = config_file
else: else:
config['user'] = login_user config['user'] = login_user
config['passwd'] = login_password config['passwd'] = login_password

Loading…
Cancel
Save