ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Changing to read from a file pointer instead so that an exception is thrown if the file doesn't exist

Browse source
This commit is contained in:
Mark Theunissen 2012-07-26 08:58:21 -05:00
parent 12979cf834
commit 6afe3fd497
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/mysql_db
View file

@ -47,10 +47,10 @@ def db_create(cursor, db):
def load_mycnf(): def load_mycnf():
config = ConfigParser.RawConfigParser() config = ConfigParser.RawConfigParser()
mycnf = os.path.expanduser('~/.my.cnf') mycnf = os.path.expanduser('~/.my.cnf')
config.read(mycnf)
try: try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass')) creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass'))
except ConfigParser.NoOptionError: except (ConfigParser.NoOptionError, IOError):
return False return False
return creds return creds

4
library/mysql_user
View file

@ -145,10 +145,10 @@ def privileges_grant(cursor, user,host,db_table,priv):
def load_mycnf(): def load_mycnf():
config = ConfigParser.RawConfigParser() config = ConfigParser.RawConfigParser()
mycnf = os.path.expanduser('~/.my.cnf') mycnf = os.path.expanduser('~/.my.cnf')
config.read(mycnf)
try: try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass')) creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass'))
except ConfigParser.NoOptionError: except (ConfigParser.NoOptionError, IOError):
return False return False
return creds return creds