Revert "Add prefixing and suffixing fuctionality to assemble module" (#16084)

pull/16069/head
Brian Coca 8 years ago
parent a596ba3106
commit 3387d557bc

@ -32,7 +32,7 @@ class ActionModule(ActionBase):
TRANSFERS_FILES = True
def _assemble_from_fragments(self, src_path, delimiter=None, compiled_regexp=None, ignore_hidden=False, header=None, footer=None):
def _assemble_from_fragments(self, src_path, delimiter=None, compiled_regexp=None, ignore_hidden=False):
''' assemble a file from a directory of fragments '''
tmpfd, temp_path = tempfile.mkstemp()
@ -40,11 +40,6 @@ class ActionModule(ActionBase):
delimit_me = False
add_newline = False
if header is not None:
if not header.endswith('\n'):
header += '\n'
tmp.write(header)
for f in sorted(os.listdir(src_path)):
if compiled_regexp and not compiled_regexp.search(f):
continue
@ -75,13 +70,6 @@ class ActionModule(ActionBase):
else:
add_newline = True
if footer is not None:
if add_newline: # last fragment did not end with \n
footer = '\n' + footer
if not footer.endswith('\n'):
footer += '\n'
tmp.write(footer)
tmp.close()
return temp_path
@ -99,8 +87,6 @@ class ActionModule(ActionBase):
src = self._task.args.get('src', None)
dest = self._task.args.get('dest', None)
delimiter = self._task.args.get('delimiter', None)
header = self._task.args.get('header', None)
footer = self._task.args.get('footer', None)
remote_src = self._task.args.get('remote_src', 'yes')
regexp = self._task.args.get('regexp', None)
follow = self._task.args.get('follow', False)
@ -135,7 +121,7 @@ class ActionModule(ActionBase):
return result
# Does all work assembling the file
path = self._assemble_from_fragments(src, delimiter, _re, ignore_hidden, header, footer)
path = self._assemble_from_fragments(src, delimiter, _re, ignore_hidden)
path_checksum = checksum_s(path)
dest = self._remote_expand_user(dest)

@ -91,13 +91,3 @@
- "result.state == 'file'"
- "result.checksum == '505359f48c65b3904127cf62b912991d4da7ed6d'"
- name: test assemble with a header and a footer
assemble: src="{{output_dir}}/src" dest="{{output_dir}}/assembled6" header="prefix" footer="suffix"
register: result
- name: assert the fragments were assembled with a header and a footer
assert:
that:
- "result.state == 'file'"
- "result.checksum == 'c5cca6452da7b193427ea17583188f7a17df3b60'"

Loading…
Cancel
Save