Date: Saturday, June 3, 2017 @ 12:01:04 Author: svenstaro Revision: 233730
upgpkg: ansible 2.3.1.0-1 Modified: ansible/trunk/PKGBUILD Deleted: ansible/trunk/23710.patch -------------+ 23710.patch | 23 ----------------------- PKGBUILD | 16 +++++----------- 2 files changed, 5 insertions(+), 34 deletions(-) Deleted: 23710.patch =================================================================== --- 23710.patch 2017-06-03 11:59:14 UTC (rev 233729) +++ 23710.patch 2017-06-03 12:01:04 UTC (rev 233730) @@ -1,23 +0,0 @@ -From 0dd0600a6be610a6eeec68332e10e18fb1560304 Mon Sep 17 00:00:00 2001 -From: Matt Martz <m...@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-06-03 11:59:14 UTC (rev 233729) +++ PKGBUILD 2017-06-03 12:01:04 UTC (rev 233730) @@ -7,8 +7,8 @@ # Contributor: atweiden <archb...@gmail.com> pkgname=(ansible python-ansible) -pkgver=2.3.0.0 -pkgrel=5 +pkgver=2.3.1.0 +pkgrel=1 pkgdesc='Radically simple IT automation platform' arch=('any') url='http://www.ansible.com' @@ -22,19 +22,13 @@ 'python2-ovirt-engine-sdk: ovirt support' 'python2-jmespath: json_query support') makedepends=('asciidoc' 'fakeroot' 'python' 'python2-setuptools' - 'python-setuptools') + 'python-setuptools') backup=('etc/ansible/ansible.cfg') -source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz" - 23710.patch) -sha512sums=('88ac28befefd7a70c36d8c33bc1aba1b0a5ffdea4bddd0b9e6c5488c70057662812208c221e47721c5a194fc30282a33490f196a719d9eb6d9b1e7dcfd1ff941' - 'd041f1fe8d57680d8c7fcc2337a04b2e4bbcb5fd44c5562065a54f8f3288850b6ca0f9aba2a134659b9049f4b4a4dddb40ce0a761f8e94c4813d20cd8a5b1c65') +source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz") +sha512sums=('7b4b33c56a15c41d756f095944d7a0dbf894557350879430df21061b717b9574aae624a276bf7e1a13d043b718aeaccac1ce510a3cb085983311ddf06fa832bc') 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() {