GNU bug report logs - #27452
[PATCH] gnu: ansible: Apply experimental patch to deal with wrapping of ansible script.

Previous Next

Package: guix-patches;

Reported by: Jelle Licht <jlicht <at> fsfe.org>

Date: Thu, 22 Jun 2017 19:37:02 UTC

Severity: normal

Tags: patch

Done: ludo <at> gnu.org (Ludovic Courtès)

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 27452 in the body.
You can then email your comments to 27452 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#27452; Package guix-patches. (Thu, 22 Jun 2017 19:37:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Jelle Licht <jlicht <at> fsfe.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 22 Jun 2017 19:37:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jelle Licht <jlicht <at> fsfe.org>
To: guix-patches <at> gnu.org
Cc: Jelle Licht <jlicht <at> fsfe.org>
Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping
 of ansible script.
Date: Thu, 22 Jun 2017 21:36:20 +0200

See <http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html> 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                               |  5 ++++-
 gnu/packages/patches/ansible-wrap-program-hack.patch | 17 +++++++++++++++++
 3 files changed, 22 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 88ea8daf4..bed24a841 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 35679495f..81a53413f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1366,7 +1366,10 @@ of supported upstream metrics systems simultaneously.")
        (uri (pypi-uri "ansible" version))
        (sha256
         (base32
-         "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"))))
+         "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"))
+       ;; FIXME: Remove once wrapping ansible works properly
+       ;; See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html
+       (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..bc7eb9d31
--- /dev/null
+++ b/gnu/packages/patches/ansible-wrap-program-hack.patch
@@ -0,0 +1,17 @@
+--- 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
Information forwarded to guix-patches <at> gnu.org:
bug#27452; Package guix-patches. (Mon, 26 Jun 2017 09:40:01 GMT) Full text and rfc822 format available.

Message #8 received at 27452 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jelle Licht <jlicht <at> fsfe.org>
Cc: 27452 <at> debbugs.gnu.org
Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to
 deal with wrapping of ansible script.
Date: Mon, 26 Jun 2017 11:39:39 +0200

Hello,

Jelle Licht <jlicht <at> fsfe.org> skribis:

> See <http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html> 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                               |  5 ++++-
>  gnu/packages/patches/ansible-wrap-program-hack.patch | 17 +++++++++++++++++
>  3 files changed, 22 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 88ea8daf4..bed24a841 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 35679495f..81a53413f 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -1366,7 +1366,10 @@ of supported upstream metrics systems simultaneously.")
>         (uri (pypi-uri "ansible" version))
>         (sha256
>          (base32
> -         "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"))))
> +         "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"))
> +       ;; FIXME: Remove once wrapping ansible works properly
> +       ;; See http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html
> +       (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..bc7eb9d31
> --- /dev/null
> +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch
> @@ -0,0 +1,17 @@
> +--- 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 @@

Could you move the FIXME and URL to the .patch file, and also add a
sentence explaining what it does?

OK with these changes, thanks!

Ludo’.
Information forwarded to guix-patches <at> gnu.org:
bug#27452; Package guix-patches. (Mon, 26 Jun 2017 10:48:01 GMT) Full text and rfc822 format available.

Message #11 received at 27452 <at> debbugs.gnu.org (full text, mbox):

From: Jelle Licht <jlicht <at> fsfe.org>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 27452 <at> debbugs.gnu.org
Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to
 deal with wrapping of ansible script.
Date: Mon, 26 Jun 2017 12:46:58 +0200

[Message part 1 (text/plain, inline)]
Hello,

2017-06-26 11:39 GMT+02:00 Ludovic Courtès <ludo <at> gnu.org>:

> Hello,
>
> Jelle Licht <jlicht <at> fsfe.org> skribis:
>
> > See <http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html>
> 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                               |  5 ++++-
> >  gnu/packages/patches/ansible-wrap-program-hack.patch | 17
> +++++++++++++++++
> >  3 files changed, 22 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 88ea8daf4..bed24a841 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 35679495f..81a53413f 100644
> > --- a/gnu/packages/admin.scm
> > +++ b/gnu/packages/admin.scm
> > @@ -1366,7 +1366,10 @@ of supported upstream metrics systems
> simultaneously.")
> >         (uri (pypi-uri "ansible" version))
> >         (sha256
> >          (base32
> > -         "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"))))
> > +         "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd"))
> > +       ;; FIXME: Remove once wrapping ansible works properly
> > +       ;; See http://lists.gnu.org/archive/h
> tml/bug-guix/2017-05/msg00015.html
> > +       (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..bc7eb9d31
> > --- /dev/null
> > +++ b/gnu/packages/patches/ansible-wrap-program-hack.patch
> > @@ -0,0 +1,17 @@
> > +--- 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 @@
>
> Could you move the FIXME and URL to the .patch file, and also add a
> sentence explaining what it does?
>

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?

>
> OK with these changes, thanks!
>
> Ludo’.
>

[Message part 2 (text/html, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#27452; Package guix-patches. (Mon, 26 Jun 2017 16:13:01 GMT) Full text and rfc822 format available.

Message #14 received at 27452 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jelle Licht <jlicht <at> fsfe.org>
Cc: 27452 <at> debbugs.gnu.org
Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to
 deal with wrapping of ansible script.
Date: Mon, 26 Jun 2017 18:11:49 +0200

Jelle Licht <jlicht <at> fsfe.org> 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’.
Information forwarded to guix-patches <at> gnu.org:
bug#27452; Package guix-patches. (Mon, 26 Jun 2017 19:18:02 GMT) Full text and rfc822 format available.

Message #17 received at 27452 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jelle Licht <wordempire <at> gmail.com>
Cc: Jelle Licht <jlicht <at> fsfe.org>, 27452 <at> debbugs.gnu.org
Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to
 deal with wrapping of ansible script.
Date: Mon, 26 Jun 2017 21:17:11 +0200

Jelle Licht <wordempire <at> gmail.com> skribis:

> From 1c5ac5bac497f415e20540a193e36dc02d012bf2 Mon Sep 17 00:00:00 2001
> From: Jelle Licht <jlicht <at> fsfe.org>
> Date: Thu, 22 Jun 2017 21:26:49 +0200
> Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping
>  of ansible script.
>
> See <http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html> 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.

Perfect, thanks!  :-)

Ludo'.
Information forwarded to guix-patches <at> gnu.org:
bug#27452; Package guix-patches. (Tue, 27 Jun 2017 05:36:01 GMT) Full text and rfc822 format available.

Message #20 received at 27452 <at> debbugs.gnu.org (full text, mbox):

From: Jelle Licht <wordempire <at> gmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Jelle Licht <jlicht <at> fsfe.org>, 27452 <at> debbugs.gnu.org
Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to
 deal with wrapping of ansible script.
Date: Mon, 26 Jun 2017 19:33:56 +0200

[Message part 1 (text/plain, inline)]
Ludovic Courtès <ludo <at> gnu.org> writes:

> Jelle Licht <jlicht <at> fsfe.org> 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.


[0001-gnu-ansible-Apply-experimental-patch-to-deal-with-wr.patch (text/x-patch, attachment)]
Reply sent to ludo <at> gnu.org (Ludovic Courtès):
You have taken responsibility. (Thu, 29 Jun 2017 12:56:01 GMT) Full text and rfc822 format available.
Notification sent to Jelle Licht <jlicht <at> fsfe.org>:
bug acknowledged by developer. (Thu, 29 Jun 2017 12:56:02 GMT) Full text and rfc822 format available.

Message #25 received at 27452-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jelle Licht <wordempire <at> gmail.com>
Cc: Jelle Licht <jlicht <at> fsfe.org>, 27452-done <at> debbugs.gnu.org
Subject: Re: [bug#27452] [PATCH] gnu: ansible: Apply experimental patch to
 deal with wrapping of ansible script.
Date: Thu, 29 Jun 2017 14:55:13 +0200

Jelle Licht <wordempire <at> gmail.com> skribis:

>>From 1c5ac5bac497f415e20540a193e36dc02d012bf2 Mon Sep 17 00:00:00 2001
> From: Jelle Licht <jlicht <at> fsfe.org>
> Date: Thu, 22 Jun 2017 21:26:49 +0200
> Subject: [PATCH] gnu: ansible: Apply experimental patch to deal with wrapping
>  of ansible script.
>
> See <http://lists.gnu.org/archive/html/bug-guix/2017-05/msg00015.html> 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.

Committed, thanks!

Ludo'.
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 28 Jul 2017 11:24:05 GMT) Full text and rfc822 format available.
This bug report was last modified 7 years and 333 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.