cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki 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 5ab81692d7
commit 894e4ff78a
2 changed files with 4 additions and 4 deletions

4
mysql_db
View file

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

4
mysql_user
View file

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