GNU bug report logs - #36752
[PATCH 0/2] git-annex: Don't patch hook shebangs and update version

Previous Next

Package: guix-patches;

Reported by: Kyle Meyer <kyle <at> kyleam.com>

Date: Sun, 21 Jul 2019 19:47:02 UTC

Severity: normal

Tags: patch

Done: Marius Bakke <mbakke <at> fastmail.com>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#36752: closed ([PATCH 0/2] git-annex: Don't patch hook
 shebangs and update version)
Date: Thu, 08 Aug 2019 18:23:01 +0000
[Message part 1 (text/plain, inline)]
Your message dated Thu, 08 Aug 2019 20:22:04 +0200
with message-id <87blwzikkz.fsf <at> devup.no>
and subject line Re: [bug#36752] [PATCH 0/2] git-annex: Don't patch hook shebangs and update version
has caused the debbugs.gnu.org bug report #36752,
regarding [PATCH 0/2] git-annex: Don't patch hook shebangs and update version
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
36752: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=36752
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Kyle Meyer <kyle <at> kyleam.com>
To: guix-patches <at> gnu.org
Cc: Timothy Sample <samplet <at> ngyro.com>, Kyle Meyer <kyle <at> kyleam.com>
Subject: [PATCH 0/2] git-annex: Don't patch hook shebangs and update version
Date: Sun, 21 Jul 2019 15:46:26 -0400
The git-annex definition patches the snippet that git-annex uses as the
shebang when creating its Git hooks.  As discussed previously [1], this is
problematic because the hooks refer to a bash that may later be garbage
collected.

However, a large number of the tests fail if we simply don't patch the shebang
because the hooks of course can't find the unpatched "/bin/sh" in the build
environment [2].  The first patch updates the definition to use a "patch,
build, test, revert patch, re-build" sequence.  It's not pretty, but it
certainly seems better than disabling the tests.  Please let me know if you
have suggestions for a cleaner approach.

The second patch updates git-annex to its latest version.

[1] https://lists.gnu.org/archive/html/guix-devel/2018-08/msg00142.html
[2] https://lists.gnu.org/archive/html/guix-devel/2019-02/msg00012.html

Kyle Meyer (2):
  gnu: git-annex: Don't patch shebang used in hooks.
  gnu: git-annex: Update to 7.20190708.

 gnu/packages/haskell-apps.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

-- 
2.22.0



[Message part 3 (message/rfc822, inline)]
From: Marius Bakke <mbakke <at> fastmail.com>
To: Kyle Meyer <kyle <at> kyleam.com>, 36752-done <at> debbugs.gnu.org
Subject: Re: [bug#36752] [PATCH 0/2] git-annex: Don't patch hook shebangs and
 update version
Date: Thu, 08 Aug 2019 20:22:04 +0200
[Message part 4 (text/plain, inline)]
Kyle Meyer <kyle <at> kyleam.com> writes:

> The git-annex definition patches the snippet that git-annex uses as the
> shebang when creating its Git hooks.  As discussed previously [1], this is
> problematic because the hooks refer to a bash that may later be garbage
> collected.
>
> However, a large number of the tests fail if we simply don't patch the shebang
> because the hooks of course can't find the unpatched "/bin/sh" in the build
> environment [2].  The first patch updates the definition to use a "patch,
> build, test, revert patch, re-build" sequence.  It's not pretty, but it
> certainly seems better than disabling the tests.  Please let me know if you
> have suggestions for a cleaner approach.
>
> The second patch updates git-annex to its latest version.
>
> [1] https://lists.gnu.org/archive/html/guix-devel/2018-08/msg00142.html
> [2] https://lists.gnu.org/archive/html/guix-devel/2019-02/msg00012.html
>
> Kyle Meyer (2):
>   gnu: git-annex: Don't patch shebang used in hooks.
>   gnu: git-annex: Update to 7.20190708.

Thank you for fixing the shebang bug, and for updating the package.

Applied both, thanks!
[signature.asc (application/pgp-signature, inline)]

This bug report was last modified 5 years and 288 days ago.

Previous Next


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