diff options
| author | James Cammarata <jimi@sngx.net> | 2014-05-05 10:59:44 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2014-05-05 10:59:44 -0500 |
| commit | ef741178c440afa530e2493c6167ddbcb91c5639 (patch) | |
| tree | e64683cd319eeeda41681ed5a71e660992c2b165 | |
| parent | fd03cc04e6263b69bae0245a37fc0e25d32317e2 (diff) | |
| parent | b9f7da7b4443ad35eb3268af595480b679e76a8e (diff) | |
| download | ansible-ef741178c440afa530e2493c6167ddbcb91c5639.tar.gz | |
Merge pull request #7280 from angstwad/docker_inv_fix
Docker inventory bugfix for potential traceback
| -rwxr-xr-x | plugins/inventory/docker.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/inventory/docker.py b/plugins/inventory/docker.py index 275be2b301..30cb354b53 100755 --- a/plugins/inventory/docker.py +++ b/plugins/inventory/docker.py @@ -299,7 +299,7 @@ def list_groups(): try: port = client.port(container, ssh_port)[0] - except (IndexError, AttributeError): + except (IndexError, AttributeError, TypeError): port = dict() try: |