internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'use_comps' of git://github.com/j2sol/ansible into devel

Browse Source
This commit is contained in:
Michael DeHaan
2014-01-04 13:36:40 -05:00
parent 10350d1639 23720ff19d
commit 227e8e31c9
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/inventory/__init__.py
View File

@@ -133,11 +133,7 @@ class Inventory(object):
# exclude hosts not in a subset, if defined
if self._subset:
subset = self._get_hosts(self._subset)
new_hosts = []
for h in hosts:
if h in subset and h not in new_hosts:
new_hosts.append(h)
hosts = new_hosts
hosts = [ h for h in hosts if h in subset ]
# exclude hosts mentioned in any restriction (ex: failed hosts)
if self._restriction is not None:
@@ -183,9 +179,7 @@ class Inventory(object):
elif p.startswith("&"):
hosts = [ h for h in hosts if h in that ]
else:
for h in that:
if h not in hosts:
hosts.append(h)
hosts.extend([ h for h in that if h not in hosts ])
return hosts