Attachment 166108 Details for Bug 206591 – ansible fix

[patch] ansible fix

ansible-fix.diff (text/plain), 3.05 KB, created by Nikolai Lifanov on 2016-01-25 16:30:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2016-01-25 16:30:42 UTC

Size: 3.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 407211)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ansible
> PORTVERSION?=	2.0.0.2
>-PORTREVISION?=	1
>+PORTREVISION?=	2
> CATEGORIES=	sysutils python
> MASTER_SITES=	http://releases.ansible.com/ansible/
> 
>@@ -20,7 +20,7 @@
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-EXTRA_PATCHES?=	${FILESDIR}/extra-patch-8647fdc
>+EXTRA_PATCHES?=	${FILESDIR}/extra-patch-quote-become-cmd
> 
> NO_ARCH=	yes
> USES=		cpe python:2 shebangfix
>Index: files/extra-patch-8647fdc
>===================================================================
>--- files/extra-patch-8647fdc	(revision 407211)
>+++ files/extra-patch-8647fdc	(nonexistent)
>@@ -1,21 +0,0 @@
>---- 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:
>
>Property changes on: files/extra-patch-8647fdc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/extra-patch-quote-become-cmd
>===================================================================
>--- files/extra-patch-quote-become-cmd	(nonexistent)
>+++ files/extra-patch-quote-become-cmd	(working copy)
>@@ -0,0 +1,11 @@
>+--- lib/ansible/playbook/play_context.py.orig	2016-01-25 16:24:15 UTC
>++++ lib/ansible/playbook/play_context.py
>+@@ -507,7 +507,7 @@ class PlayContext(Base):
>+             self.success_key = success_key
>+             return ('%s -c %s' % (executable, pipes.quote(becomecmd)))
>+ 
>+-        return cmd
>++        return pipes.quote(cmd)
>+ 
>+     def update_vars(self, variables):
>+         '''
>
>Property changes on: files/extra-patch-quote-become-cmd
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 206591: 166104 | 166108 | 166202