ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases 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
commit 227e8e31c9
1 changed files with 2 additions and 8 deletions
Show stats 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 # exclude hosts not in a subset, if defined
if self._subset: if self._subset:
subset = self._get_hosts(self._subset) subset = self._get_hosts(self._subset)
new_hosts = [] hosts = [ h for h in hosts if h in subset ]
for h in hosts:
if h in subset and h not in new_hosts:
new_hosts.append(h)
hosts = new_hosts
# exclude hosts mentioned in any restriction (ex: failed hosts) # exclude hosts mentioned in any restriction (ex: failed hosts)
if self._restriction is not None: if self._restriction is not None:
@ -183,9 +179,7 @@ class Inventory(object):
elif p.startswith("&"): elif p.startswith("&"):
hosts = [ h for h in hosts if h in that ] hosts = [ h for h in hosts if h in that ]
else: else:
for h in that: hosts.extend([ h for h in that if h not in hosts ])
if h not in hosts:
hosts.append(h)
return hosts return hosts