Attachment #166108 for bug #206591

Lines 3-9 Link Here

(-)Makefile (-2 / +2 lines)
3		3
4	PORTNAME= ansible	4	PORTNAME= ansible
5	PORTVERSION?= 2.0.0.2	5	PORTVERSION?= 2.0.0.2
6	PORTREVISION?= 1	6	PORTREVISION?= 2
7	CATEGORIES= sysutils python	7	CATEGORIES= sysutils python
8	MASTER_SITES= http://releases.ansible.com/ansible/	8	MASTER_SITES= http://releases.ansible.com/ansible/
9		9
Lines 20-26 Link Here
20		20
21	OPTIONS_DEFINE= DOCS EXAMPLES	21	OPTIONS_DEFINE= DOCS EXAMPLES
22		22
23	EXTRA_PATCHES?= ${FILESDIR}/extra-patch-8647fdc	23	EXTRA_PATCHES?= ${FILESDIR}/extra-patch-quote-become-cmd
24		24
25	NO_ARCH= yes	25	NO_ARCH= yes
26	USES= cpe python:2 shebangfix	26	USES= cpe python:2 shebangfix




--- lib/ansible/plugins/action/__init__.py.orig	2016-01-14 22:33:27 UTC
+++ lib/ansible/plugins/action/__init__.py
@@ -475,8 +475,7 @@ class ActionBase(with_metaclass(ABCMeta,
         display.debug("done with _execute_module (%s, %s)" % (module_name, module_args))
         return data
 
-    def _low_level_execute_command(self, cmd, sudoable=True, in_data=None,
-            executable=None, encoding_errors='replace'):
+    def _low_level_execute_command(self, cmd, sudoable=True, in_data=None, executable=C.DEFAULT_EXECUTABLE, encoding_errors='replace'):
         '''
         This is the function which executes the low level shell command, which
         may be commands to create/remove directories for temporary files, or to
@@ -492,7 +491,7 @@ class ActionBase(with_metaclass(ABCMeta,
         '''
 
         if executable is not None:
-            cmd = executable + ' -c ' + cmd
+            cmd = executable + ' -c ' + pipes.quote(cmd)
 
         display.debug("_low_level_execute_command(): starting")
         if not cmd:

Line 0 Link Here

(-)files/extra-patch-quote-become-cmd (+11 lines)
	1	--- lib/ansible/playbook/play_context.py.orig 2016-01-25 16:24:15 UTC
	2	+++ lib/ansible/playbook/play_context.py
	3	@@ -507,7 +507,7 @@ class PlayContext(Base):
	4	self.success_key = success_key
	5	return ('%s -c %s' % (executable, pipes.quote(becomecmd)))
	6
	7	- return cmd
	8	+ return pipes.quote(cmd)
	9
	10	def update_vars(self, variables):
	11	'''

Return to bug 206591

Lines 1-21 Link Here

(-)files/extra-patch-8647fdc (-21 lines)
1	--- lib/ansible/plugins/action/__init__.py.orig 2016-01-14 22:33:27 UTC
2	+++ lib/ansible/plugins/action/__init__.py
3	@@ -475,8 +475,7 @@ class ActionBase(with_metaclass(ABCMeta,
4	display.debug("done with _execute_module (%s, %s)" % (module_name, module_args))
5	return data
6
7	- def _low_level_execute_command(self, cmd, sudoable=True, in_data=None,
8	- executable=None, encoding_errors='replace'):
9	+ def _low_level_execute_command(self, cmd, sudoable=True, in_data=None, executable=C.DEFAULT_EXECUTABLE, encoding_errors='replace'):
10	'''
11	This is the function which executes the low level shell command, which
12	may be commands to create/remove directories for temporary files, or to
13	@@ -492,7 +491,7 @@ class ActionBase(with_metaclass(ABCMeta,
14	'''
15
16	if executable is not None:
17	- cmd = executable + ' -c ' + cmd
18	+ cmd = executable + ' -c ' + pipes.quote(cmd)
19
20	display.debug("_low_level_execute_command(): starting")
21	if not cmd: