cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added ignore hidden to assemble

Browse source
This commit is contained in:
Brian Coca 2015-07-09 00:27:44 -04:00 committed by Matt Clay
parent 16381fb5c0
commit f8f4a7dcdf
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/files/assemble.py
View file

@ -79,6 +79,12 @@ options:
U(http://docs.python.org/2/library/re.html). U(http://docs.python.org/2/library/re.html).
required: false required: false
default: null default: null
ignore_hidden:
description:
- A boolean that controls if files that start with a '.' will be included or not.
required: false
default: false
version_added: "2.0"
author: "Stephen Fromm (@sfromm)" author: "Stephen Fromm (@sfromm)"
extends_documentation_fragment: files extends_documentation_fragment: files
''' '''
@ -94,7 +100,7 @@ EXAMPLES = '''
# =========================================== # ===========================================
# Support method # Support method
def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None): def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None, ignore_hidden=False):
''' assemble a file from a directory of fragments ''' ''' assemble a file from a directory of fragments '''
tmpfd, temp_path = tempfile.mkstemp() tmpfd, temp_path = tempfile.mkstemp()
tmp = os.fdopen(tmpfd,'w') tmp = os.fdopen(tmpfd,'w')
@ -105,7 +111,7 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None):
if compiled_regexp and not compiled_regexp.search(f): if compiled_regexp and not compiled_regexp.search(f):
continue continue
fragment = "%s/%s" % (src_path, f) fragment = "%s/%s" % (src_path, f)
if not os.path.isfile(fragment): if not os.path.isfile(fragment) or (ignore_hidden and os.path.basename(fragment).startswith('.')):
continue continue
fragment_content = file(fragment).read() fragment_content = file(fragment).read()
@ -148,6 +154,7 @@ def main():
backup=dict(default=False, type='bool'), backup=dict(default=False, type='bool'),
remote_src=dict(default=False, type='bool'), remote_src=dict(default=False, type='bool'),
regexp = dict(required=False), regexp = dict(required=False),
ignore_hidden = dict(default=False, type='bool'),
), ),
add_file_common_args=True add_file_common_args=True
) )
@ -162,6 +169,7 @@ def main():
delimiter = module.params['delimiter'] delimiter = module.params['delimiter']
regexp = module.params['regexp'] regexp = module.params['regexp']
compiled_regexp = None compiled_regexp = None
ignore_hidden = module.params['ignore_hidden']
if not os.path.exists(src): if not os.path.exists(src):
module.fail_json(msg="Source (%s) does not exist" % src) module.fail_json(msg="Source (%s) does not exist" % src)
@ -175,7 +183,7 @@ def main():
except re.error, e: except re.error, e:
module.fail_json(msg="Invalid Regexp (%s) in \"%s\"" % (e, regexp)) module.fail_json(msg="Invalid Regexp (%s) in \"%s\"" % (e, regexp))
path = assemble_from_fragments(src, delimiter, compiled_regexp) path = assemble_from_fragments(src, delimiter, compiled_regexp, ignore_hidden)
path_hash = module.sha1(path) path_hash = module.sha1(path)
if os.path.exists(dest): if os.path.exists(dest):