From 9ea26c75f9f18314d85c77f827fccd67e586fa05 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Thu, 15 Nov 2012 17:40:34 +0100
Subject: [PATCH] Make --list-hosts consider all plays (in multiple playbooks)

Currently when more than one playbook is provided on the commandline, ansible-playbook --list-hosts will only consider the first playbook and stop. This change will make it work for the various different playbooks.
---
 bin/ansible-playbook | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index 13db4872dc..3a77c5ed4d 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -119,6 +119,7 @@ def main(args):
         )
         
         if options.listhosts:
+            print 'playbook: %s' % playbook
             playnum = 0
             for play in pb.playbook:
                 playnum += 1
@@ -126,11 +127,11 @@ def main(args):
                     label = 'unnamed'
                     if 'name' in play:
                         label = play['name']
-                    print 'hosts in play %s: %s' % (playnum, label)
-                    for host in pb.inventory.list_hosts(play['hosts']):
-                        print '  %s' % host
-                    print '\n'
-            return 0
+                    hosts = pb.inventory.list_hosts(play['hosts'])
+                    print '  hosts in play %s (%s): #%d' % (playnum, label, len(hosts))
+                    for host in hosts:
+                        print '    %s' % host
+            continue
 
         if options.syntax:
             # if we've not exited by now then we are fine.