cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #927 from bobrik/fix-undefined-e

Browse source 
[docker] fixed: global name 'e' is not defined
This commit is contained in:
Toshio Kuratomi 2015-03-12 08:19:10 -07:00
commit 54fd95288e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/docker/docker.py
View file

@ -1094,7 +1094,7 @@ class DockerManager(object):
email=self.module.params.get('email'),
registry=self.module.params.get('registry')
)
except e:
except Exception as e:
self.module.fail_json(msg="failed to login to the remote registry, check your username/password.", error=repr(e))
try:
last = None
@ -1110,7 +1110,7 @@ class DockerManager(object):
else:
# Unrecognized status string.
self.module.fail_json(msg="Unrecognized status from pull.", status=status)
except e:
except Exception as e:
self.module.fail_json(msg="Failed to pull the specified image: %s" % resource, error=repr(e))
def create_containers(self, count=1):