diff options
author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-03-03 01:44:50 +0100 |
---|---|---|
committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-03-03 01:44:50 +0100 |
commit | e6a1acf756dcee1e23b6f0642563e2773fe7805d (patch) | |
tree | 421766278b95ede847b0b1f9215032ba9f6f880a | |
parent | make command module error when no -a more obvious as command is the default m... (diff) | |
download | ansible-e6a1acf756dcee1e23b6f0642563e2773fe7805d.tar.xz ansible-e6a1acf756dcee1e23b6f0642563e2773fe7805d.zip |
Let "all" be an alias for "*" in patterns, fix output bug on non-command execution, make clean now removes the build dir
-rw-r--r-- | Makefile | 1 | ||||
-rwxr-xr-x | bin/ansible | 1 | ||||
-rwxr-xr-x | lib/ansible/runner.py | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | library/facter | 0 |
4 files changed, 4 insertions, 0 deletions
@@ -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 bf72f440fb..ad39d465aa 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 574ab941f9..426d534772 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 index 16bbbbe93e..16bbbbe93e 100644..100755 --- a/library/facter +++ b/library/facter |