Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
488aec39
Commit
488aec39
authored
Jun 27, 2014
by
mesk41in
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix unsupported regexp parameter in assemble
parent
05eb6aac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletions
+8
-1
lib/ansible/module_utils/basic.py
+1
-0
lib/ansible/runner/action_plugins/assemble.py
+7
-1
No files found.
lib/ansible/module_utils/basic.py
View file @
488aec39
...
...
@@ -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
)
...
...
lib/ansible/runner/action_plugins/assemble.py
View file @
488aec39
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment