saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #27601 from blueyed/dockerng-none-names

Browse source 
dockerng: handle None in container.Names
This commit is contained in:
Nicole Thomas 2015-10-05 14:32:19 -06:00
commit f7f48d1eef
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/dockerng.py
View file

@ -2130,7 +2130,7 @@ def list_containers(**kwargs):
'''
ret = set()
for item in six.itervalues(ps_(all=kwargs.get('all', False))):
for c_name in [x.lstrip('/') for x in item.get('Names', [])]:
for c_name in [x.lstrip('/') for x in item.get('Names', []) or []]:
ret.add(c_name)
return sorted(ret)