Merge pull request #2404 from lorin/mysql-mycnf-user
.my.cnf: default to login when no user specified
This commit is contained in:
commit
910aedfbeb
1 changed files with 15 additions and 2 deletions
17
mysql_user
17
mysql_user
|
@ -98,7 +98,17 @@ requirements: [ "ConfigParser", "MySQLdb" ]
|
|||
author: Mark Theunissen
|
||||
'''
|
||||
|
||||
EXAMPLES = """
|
||||
# Example .my.cnf file for setting the root password
|
||||
# Note: don't use quotes around the password, because the mysql_user module
|
||||
# will include them in the password but the mysql client will not
|
||||
[client]
|
||||
user=root
|
||||
password=n<_665{vS43y
|
||||
"""
|
||||
|
||||
import ConfigParser
|
||||
import getpass
|
||||
try:
|
||||
import MySQLdb
|
||||
except ImportError:
|
||||
|
@ -260,10 +270,13 @@ def load_mycnf():
|
|||
passwd = config.get('client', 'pass')
|
||||
except (ConfigParser.NoOptionError):
|
||||
return False
|
||||
|
||||
# If .my.cnf doesn't specify a user, default to user login name
|
||||
try:
|
||||
creds = dict(user=config.get('client', 'user'),passwd=passwd)
|
||||
user = config.get('client', 'user')
|
||||
except (ConfigParser.NoOptionError):
|
||||
return False
|
||||
user = getpass.getuser()
|
||||
creds = dict(user=user,passwd=passwd)
|
||||
return creds
|
||||
|
||||
# ===========================================
|
||||
|
|
Loading…
Reference in a new issue