mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Let "all" be an alias for "*" in patterns, fix output bug on non-command execution, make clean now removes the build dir
This commit is contained in:
parent
c8b1bbc7ea
commit
e6a1acf756
4 changed files with 4 additions and 0 deletions
1
Makefile
1
Makefile
|
@ -24,6 +24,7 @@ pep8:
|
||||||
pep8 lib/
|
pep8 lib/
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
rm -rf build
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
find . -type f -name "*.pyo" -delete
|
find . -type f -name "*.pyo" -delete
|
||||||
find . -type f -name "*~" -delete
|
find . -type f -name "*~" -delete
|
||||||
|
|
|
@ -170,6 +170,7 @@ class Cli(object):
|
||||||
else:
|
else:
|
||||||
buf += "%s | FAILED >>" % hostname
|
buf += "%s | FAILED >>" % hostname
|
||||||
buf += json.dumps(result, indent=4, sort_keys=True)
|
buf += json.dumps(result, indent=4, sort_keys=True)
|
||||||
|
print buf
|
||||||
if options.tree:
|
if options.tree:
|
||||||
path = os.path.join(options.tree, hostname)
|
path = os.path.join(options.tree, hostname)
|
||||||
fd = open(path, "w+")
|
fd = open(path, "w+")
|
||||||
|
|
|
@ -121,6 +121,8 @@ class Runner(object):
|
||||||
subpatterns = pattern.split(";")
|
subpatterns = pattern.split(";")
|
||||||
for subpattern in subpatterns:
|
for subpattern in subpatterns:
|
||||||
# the pattern could be a real glob
|
# the pattern could be a real glob
|
||||||
|
if subpattern == 'all':
|
||||||
|
return True
|
||||||
if fnmatch.fnmatch(host_name, subpattern):
|
if fnmatch.fnmatch(host_name, subpattern):
|
||||||
return True
|
return True
|
||||||
# or it could be a literal group name instead
|
# or it could be a literal group name instead
|
||||||
|
|
0
library/facter
Normal file → Executable file
0
library/facter
Normal file → Executable file
Loading…
Reference in a new issue