From e6a1acf756dcee1e23b6f0642563e2773fe7805d Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 2 Mar 2012 19:44:50 -0500 Subject: [PATCH] Let "all" be an alias for "*" in patterns, fix output bug on non-command execution, make clean now removes the build dir --- Makefile | 1 + bin/ansible | 1 + lib/ansible/runner.py | 2 ++ library/facter | 0 4 files changed, 4 insertions(+) mode change 100644 => 100755 library/facter diff --git a/Makefile b/Makefile index 6fa152a7d52..1a4e97e3a07 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ pep8: pep8 lib/ clean: + rm -rf build find . -type f -name "*.pyc" -delete find . -type f -name "*.pyo" -delete find . -type f -name "*~" -delete diff --git a/bin/ansible b/bin/ansible index bf72f440fba..ad39d465aa6 100755 --- a/bin/ansible +++ b/bin/ansible @@ -170,6 +170,7 @@ class Cli(object): else: buf += "%s | FAILED >>" % hostname buf += json.dumps(result, indent=4, sort_keys=True) + print buf if options.tree: path = os.path.join(options.tree, hostname) fd = open(path, "w+") diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py index 574ab941f91..426d5347727 100755 --- a/lib/ansible/runner.py +++ b/lib/ansible/runner.py @@ -121,6 +121,8 @@ class Runner(object): subpatterns = pattern.split(";") for subpattern in subpatterns: # the pattern could be a real glob + if subpattern == 'all': + return True if fnmatch.fnmatch(host_name, subpattern): return True # or it could be a literal group name instead diff --git a/library/facter b/library/facter old mode 100644 new mode 100755