From 488aec39367358e9f1d1f770a9231c26cb7e4d21 Mon Sep 17 00:00:00 2001 From: mesk41in Date: Fri, 27 Jun 2014 13:54:59 +0400 Subject: [PATCH] Fix unsupported regexp parameter in assemble --- lib/ansible/module_utils/basic.py | 1 + lib/ansible/runner/action_plugins/assemble.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py index 72fa0101374..a3805461b00 100644 --- a/lib/ansible/module_utils/basic.py +++ b/lib/ansible/module_utils/basic.py @@ -153,6 +153,7 @@ FILE_COMMON_ARGUMENTS=dict( backup = dict(), force = dict(), remote_src = dict(), # used by assemble + regexp = dict(), # used by assemble delimiter = dict(), # used by assemble directory_mode = dict(), # used by copy ) diff --git a/lib/ansible/runner/action_plugins/assemble.py b/lib/ansible/runner/action_plugins/assemble.py index 1a980c1df4a..0bf8b4424a9 100644 --- a/lib/ansible/runner/action_plugins/assemble.py +++ b/lib/ansible/runner/action_plugins/assemble.py @@ -22,6 +22,7 @@ import pipes import shutil import tempfile import base64 +import re from ansible import utils from ansible.runner.return_data import ReturnData @@ -85,6 +86,7 @@ class ActionModule(object): dest = options.get('dest', None) delimiter = options.get('delimiter', None) remote_src = utils.boolean(options.get('remote_src', 'yes')) + regexp = options.get('regexp', None) if src is None or dest is None: @@ -99,8 +101,12 @@ class ActionModule(object): # the source is local, so expand it here src = os.path.expanduser(src) + _re = None + if regexp is not None: + _re = re.compile(regexp) + # Does all work assembling the file - path = self._assemble_from_fragments(src, delimiter) + path = self._assemble_from_fragments(src, delimiter, _re) pathmd5 = utils.md5s(path) remote_md5 = self.runner._remote_md5(conn, tmp, dest)