wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always define error before using it

Browse source 
When the error reason is "Forbidden", the code throws a Python exception
rather than simply outputting the exception reason.

It's not nice to throw a Python exception when all the info to display
a proper message is available.
This commit is contained in:
Kim Johansson 2015-03-27 10:46:01 +01:00
parent 75f933cf64
commit 576832e4c9
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/inventory/ec2.py
View file

@ -382,6 +382,8 @@ class Ec2Inventory(object):
for instance in instances: for instance in instances:
self.add_rds_instance(instance, region) self.add_rds_instance(instance, region)
except boto.exception.BotoServerError, e: except boto.exception.BotoServerError, e:
error = e.reason
if e.error_code == 'AuthFailure': if e.error_code == 'AuthFailure':
error = self.get_auth_error_message() error = self.get_auth_error_message()
if not e.reason == "Forbidden": if not e.reason == "Forbidden":