From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPjAT-0000T9-6k for guix-patches@gnu.org; Tue, 27 Jun 2017 01:36:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPjAQ-0008Lz-39 for guix-patches@gnu.org; Tue, 27 Jun 2017 01:36:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPjAP-0008Lu-Uy for guix-patches@gnu.org; Tue, 27 Jun 2017 01:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dPjAP-0007k8-PG for guix-patches@gnu.org; Tue, 27 Jun 2017 01:36:01 -0400 Subject: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. Resent-Message-ID: References: <20170622193620.3381-1-jlicht@fsfe.org> <87a84v6qas.fsf@gnu.org> <87efu66856.fsf@gnu.org> From: Jelle Licht In-reply-to: <87efu66856.fsf@gnu.org> Date: Mon, 26 Jun 2017 19:33:56 +0200 Message-ID: <8760fitzzv.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27452@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Ludovic Courtès writes: > Jelle Licht skribis: > >> I am not familiar enough with .patch files to know what you expect me to do. >> I should add these comments /in/ the .patch file? > > Yes, at the top of the file, please. You can look for examples in the > other files in there. > > HTH! > > Ludo’. Thanks for the pointers. Attached you will find the updated patch. Jelle. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-ansible-Apply-experimental-patch-to-deal-with-wr.patch >From 1c5ac5bac497f415e20540a193e36dc02d012bf2 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 22 Jun 2017 21:26:49 +0200 Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script. See for the rationale. * gnu/packages/patches/ansible-wrap-program-hack.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (ansible)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 3 ++- .../patches/ansible-wrap-program-hack.patch | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ansible-wrap-program-hack.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5d024de07..f3092d580 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -501,6 +501,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegis-test-fixup-1.patch \ %D%/packages/patches/aegis-test-fixup-2.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/ansible-wrap-program-hack.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 96ca6a76d..2cc5200a0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1366,7 +1366,8 @@ of supported upstream metrics systems simultaneously.") (uri (pypi-uri "ansible" version)) (sha256 (base32 - "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")))) + "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd")) + (patches (search-patches "ansible-wrap-program-hack.patch")))) (build-system python-build-system) (native-inputs `(("python2-pycrypto" ,python2-pycrypto) diff --git a/gnu/packages/patches/ansible-wrap-program-hack.patch b/gnu/packages/patches/ansible-wrap-program-hack.patch new file mode 100644 index 000000000..c2e102839 --- /dev/null +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch @@ -0,0 +1,22 @@ +Ansible changes its behaviour depending on the name of the script that it is +called as. Make it deal with guix' .real wrapper scripts. + +FIXME: Remove once wrapping ansible works properly. +See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html. +--- ansible-2.3.0.0/bin/ansible 2017-04-12 16:08:05.000000000 +0200 ++++ ansible-2.3.0.0-fixed/bin/ansible 2017-05-21 20:11:18.720872385 +0200 +@@ -75,7 +75,13 @@ + # sometimes add that + target = target[:-1] + +- if len(target) > 1: ++ if target[-1] == "real" and target[0].startswith('.'): ++ target = target[:-1] ++ target[0] = target[0][1:] ++ if len(target) > 1 and target[1] != "real" : ++ sub = target[1] ++ myclass = "%sCLI" % sub.capitalize() ++ elif len(target) > 2 and target[2] == "real" : + sub = target[1] + myclass = "%sCLI" % sub.capitalize() + elif target[0] == 'ansible': -- 2.13.1 --=-=-=--