Attachment 165968 Details for Bug 206498 – ansible backport 8647fdc

[patch] ansible backport 8647fdc

ansible-csh-fix.diff (text/plain), 2.50 KB, created by Nikolai Lifanov on 2016-01-22 17:03:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2016-01-22 17:03:24 UTC

Size: 2.50 KB

patch

obsolete

>Index: ansible/Makefile
>===================================================================
>--- ansible/Makefile	(revision 406936)
>+++ ansible/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ansible
> PORTVERSION?=	2.0.0.2
>+PORTREVISION?=	1
> CATEGORIES=	sysutils python
> MASTER_SITES=	http://releases.ansible.com/ansible/
> 
>@@ -19,6 +20,8 @@
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>+EXTRA_PATCHES?=	${FILESDIR}/extra-patch-8647fdc
>+
> NO_ARCH=	yes
> USES=		cpe python:2 shebangfix
> USE_PYTHON=	autoplist distutils
>Index: ansible/files/extra-patch-8647fdc
>===================================================================
>--- ansible/files/extra-patch-8647fdc	(nonexistent)
>+++ ansible/files/extra-patch-8647fdc	(working copy)
>@@ -0,0 +1,21 @@
>+--- 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: ansible/files/extra-patch-8647fdc
>___________________________________________________________________
>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
>Index: ansible1/Makefile
>===================================================================
>--- ansible1/Makefile	(revision 406936)
>+++ ansible1/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PKGNAMESUFFIX=	1
> PORTVERSION=	1.9.4
>+PORTREVISION=
> 
> CONFLICTS=	ansible-*
> 
>@@ -11,4 +12,6 @@
> 
> SHEBANG_FILES=	lib/ansible/runner/action_plugins/synchronize.py
> 
>+EXTRA_PATCHES=
>+
> .include "${MASTERDIR}/Makefile"

Flags:

lifanov: maintainer-approval+

Actions: View | Diff

Attachments on bug 206498: 165964 | 165966 | 165967 | 165968