[arch-commits] Commit in ansible/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Sunday, April 30, 2017 @ 17:21:05
  Author: svenstaro
Revision: 226373

upgpkg: ansible 2.3.0.0-5

Fix FS#53724

Added:
  ansible/trunk/23710.patch
Modified:
  ansible/trunk/PKGBUILD
Deleted:
  ansible/trunk/0001-Revert-Add-jinja2-version-constraint.patch

-------------------------------------------------+
 0001-Revert-Add-jinja2-version-constraint.patch |   26 ----------------------
 23710.patch                                     |   23 +++++++++++++++++++
 PKGBUILD                                        |   12 +++++++---
 3 files changed, 32 insertions(+), 29 deletions(-)

Deleted: 0001-Revert-Add-jinja2-version-constraint.patch
===================================================================
--- 0001-Revert-Add-jinja2-version-constraint.patch	2017-04-30 17:19:51 UTC (rev 226372)
+++ 0001-Revert-Add-jinja2-version-constraint.patch	2017-04-30 17:21:05 UTC (rev 226373)
@@ -1,26 +0,0 @@
-From 3ddaf071d38cf6f1ea2bfdd80cb5de0f549d158c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski at archlinux.org>
-Date: Mon, 16 Jan 2017 19:09:30 +0100
-Subject: [PATCH] Revert "Add jinja2 version constraint."
-
-This reverts commit 06ed25e788a3324214ee3226ca35b5586ee83344.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 0eec3da0b..ef7aa3dad 100644
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,7 @@ setup(name='ansible',
-       license='GPLv3',
-       # Ansible will also make use of a system copy of python-six if installed but use a
-       # Bundled copy if it's not.
--      install_requires=['paramiko', 'jinja2 < 2.9', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
-+      install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
-       package_dir={ '': 'lib' },
-       packages=find_packages('lib'),
-       package_data={
--- 
-2.11.0
-

Added: 23710.patch
===================================================================
--- 23710.patch	                        (rev 0)
+++ 23710.patch	2017-04-30 17:21:05 UTC (rev 226373)
@@ -0,0 +1,23 @@
+From 0dd0600a6be610a6eeec68332e10e18fb1560304 Mon Sep 17 00:00:00 2001
+From: Matt Martz <matt at sivel.net>
+Date: Tue, 18 Apr 2017 11:34:07 -0500
+Subject: [PATCH] When become_method is su, self._play_context.prompt is a
+ function. Fixes #23689
+
+---
+ lib/ansible/plugins/connection/__init__.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/ansible/plugins/connection/__init__.py b/lib/ansible/plugins/connection/__init__.py
+index 8a94d6e..6ba4aa2 100644
+--- a/lib/ansible/plugins/connection/__init__.py
++++ b/lib/ansible/plugins/connection/__init__.py
+@@ -258,6 +258,8 @@ def check_password_prompt(self, b_output):
+             if not b_lines:
+                 return False
+             return b_lines[-1].strip().endswith(b_prompt) or b_lines[0].strip().endswith(b_prompt)
++        else:
++            return self._play_context.prompt(b_output)
+ 
+     def check_incorrect_password(self, b_output):
+         b_incorrect_password = to_bytes(gettext.dgettext(self._play_context.become_method, C.BECOME_ERROR_STRINGS[self._play_context.become_method]))

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-30 17:19:51 UTC (rev 226372)
+++ PKGBUILD	2017-04-30 17:21:05 UTC (rev 226373)
@@ -8,7 +8,7 @@
 
 pkgname=(ansible python-ansible)
 pkgver=2.3.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Radically simple IT automation platform'
 arch=('any')
 url='http://www.ansible.com'
@@ -24,11 +24,17 @@
 makedepends=('asciidoc' 'fakeroot' 'python' 'python2-setuptools'
              'python-setuptools') 
 backup=('etc/ansible/ansible.cfg')
-source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz")
-sha512sums=('88ac28befefd7a70c36d8c33bc1aba1b0a5ffdea4bddd0b9e6c5488c70057662812208c221e47721c5a194fc30282a33490f196a719d9eb6d9b1e7dcfd1ff941')
+source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz"
+        23710.patch)
+sha512sums=('88ac28befefd7a70c36d8c33bc1aba1b0a5ffdea4bddd0b9e6c5488c70057662812208c221e47721c5a194fc30282a33490f196a719d9eb6d9b1e7dcfd1ff941'
+            'd041f1fe8d57680d8c7fcc2337a04b2e4bbcb5fd44c5562065a54f8f3288850b6ca0f9aba2a134659b9049f4b4a4dddb40ce0a761f8e94c4813d20cd8a5b1c65')
 
 prepare() {
+  # See https://bugs.archlinux.org/task/53724
+  # and https://github.com/ansible/ansible/pull/23710
   cp -r ${pkgname}-${pkgver} "${srcdir}"/${pkgname}-${pkgver}-python
+  patch -p1 -d ${pkgname}-${pkgver} < ${srcdir}/23710.patch
+  patch -p1 -d ${pkgname}-${pkgver}-python < ${srcdir}/23710.patch
 }
 
 build() {