Merge pull request #728 from pas256/devel

Making inventory pattern matching handle group names
This commit is contained in:
Michael DeHaan 2012-07-30 13:42:24 -07:00
commit af3b0e3b82

View file

@ -105,7 +105,7 @@ class Inventory(object):
inverted = False inverted = False
for group in groups: for group in groups:
for host in group.get_hosts(): for host in group.get_hosts():
if group.name == pat or pat == 'all' or self._match(host.name, pat): if self._match(group.name, pat) or pat == 'all' or self._match(host.name, pat):
# must test explicitly for None because [] means no hosts allowed # must test explicitly for None because [] means no hosts allowed
if self._restriction==None or host.name in self._restriction: if self._restriction==None or host.name in self._restriction:
if inverted: if inverted: