Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle OSError: file exists exception #26580

Closed
wants to merge 3 commits into from
Closed

Handle OSError: file exists exception #26580

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f3d9b9
Handle OSError: file exists exception
cazorla19 Jul 10, 2017
7680253
Fix the compatibility with Python 3.x
cazorla19 Jul 10, 2017
97d6abc
Apply requested changes for exception handling
cazorla19 Jul 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion contrib/inventory/ec2.py
View file
Open in desktop
Expand Up @@ -399,7 +399,10 @@ def read_settings(self):
if self.boto_profile:
cache_dir = os.path.join(cache_dir, 'profile_' + self.boto_profile)
if not os.path.exists(cache_dir):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check is now fairly pointless. If we're going to just try/except, no point checking it first.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cazorla19 It seems like you still need to remove this line.

os.makedirs(cache_dir)
try:
os.makedirs(cache_dir)
except(OSError):
pass

cache_name = 'ansible-ec2'
cache_id = self.boto_profile or os.environ.get('AWS_ACCESS_KEY_ID', self.credentials.get('aws_access_key_id'))
Expand Down