From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: Olivier Dion <olivier.dion@polymtl.ca>
Cc: Tobias Geerinckx-Rice <me@tobias.gr>, 53238@debbugs.gnu.org
Subject: [bug#53238] [PATCH] gnu: tree: Remove stddata feature.
Date: Thu, 13 Jan 2022 17:26:19 -0500 [thread overview]
Message-ID: <87r19bxofo.fsf_-_@gmail.com> (raw)
In-Reply-To: <87ee5bwdzw.fsf@laura> (Olivier Dion's message of "Thu, 13 Jan 2022 15:57:07 -0500")
[-- Attachment #1: Type: text/plain, Size: 1326 bytes --]
Hi,
Olivier Dion <olivier.dion@polymtl.ca> writes:
> On Thu, 13 Jan 2022, Tobias Geerinckx-Rice <me@tobias.gr> wrote:
>> Olivier,
>>
>> Thanks again for tracking down this weird bug!
>>
>> Olivier Dion via Guix-patches via 写道:
>>> This feature breaks some UNIX utilities. Fix it by disabling
>>> the feature.
>>
>> Hm… How long would we have to carry this fork? My fear is we'd
>> do so indefinitely.
>
> I've contacted the maintainer asking for removal of the feature in its
> next release. I'm not sure if this will have some impact. Feel free to
> do the same at <ice+tree@mama.indstate.edu>, maybe adding more weight
> in the balance would help.
>
>> How about creating a (possibly hidden) tree-without-stddata
>> package variant, to use as input to packages who currently break
>> with this feature enabled? That lets us refcount the need for it.
>
> It's more than just packages, it's also user scripts that can be broken
> and believe me when I say that this is not an easy bug to track down ;-).
I'm on the fence about this, it does indeed seem an undesirable change,
especially since there's a --json option, but I am not the author of the
'tree' software.
Attached is an alternative that adjusts password-store instead of
removing this new tree "feature"...
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-password-store-Fix-test-failure-following-tree-u.patch --]
[-- Type: text/x-patch, Size: 2913 bytes --]
From 2a30d95c46ff1eb0bdac9307c5d6bb8e460de02f Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 13 Jan 2022 15:09:54 -0500
Subject: [PATCH] gnu: password-store: Fix test failure following 'tree'
update.
Thanks to Olivier Dion <olivier.dion@polymtl.ca> for diagnosing the source of
the problem!
* gnu/packages/password-utils.scm (password-store): Delete trailing #t.
[phases]{adjust-for-tree-2}: New phase.
---
gnu/packages/password-utils.scm | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 0ff8608c9c..16d889344b 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -487,6 +487,21 @@ (define-public password-store
(arguments
'(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'adjust-for-tree-2
+ (lambda _
+ ;; XXX: tree 2.0.1 has this new "stddata pipe" that is
+ ;; automatically used to output in JSON if the file descriptor 3
+ ;; is available. This conflicts with the test harness use of
+ ;; file descriptor 3, causing one of the tests to fail.
+ ;; Increment the file descriptors used by the harness by one to
+ ;; avoid the conflict.
+ (substitute* "tests/sharness.sh"
+ (("exec 4>&2 3>&1")
+ "exec 5>&2 4>&1")
+ (("exec 4>/dev/null 3>/dev/null")
+ "exec 5>/dev/null 4>/dev/null")
+ (("&4") "&5")
+ (("&3") "&4"))))
(delete 'configure)
(delete 'build)
(add-before 'install 'patch-system-extension-dir
@@ -500,8 +515,7 @@ (define-public password-store
(string-append " SYSTEM_EXTENSION_DIR=\""
"${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-"
extension-dir
- "}\"\n"))))
- #t))
+ "}\"\n"))))))
(add-before 'install 'patch-passmenu-path
;; FIXME Wayland support requires ydotool and dmenu-wl packages
;; We are ignoring part of the script that gets executed if
@@ -530,8 +544,7 @@ (define-public password-store
'("coreutils" "getopt" "git" "gnupg" "qrencode"
"sed" "tree" "which" "wl-clipboard" "xclip"))))
(wrap-program (string-append out "/bin/pass")
- `("PATH" ":" prefix (,(string-join path ":"))))
- #t))))
+ `("PATH" ":" prefix (,(string-join path ":"))))))))
#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)
"WITH_ALLCOMP=yes"
(string-append "BASHCOMPDIR="
--
2.34.0
[-- Attachment #3: Type: text/plain, Size: 16 bytes --]
Thanks,
Maxim
next prev parent reply other threads:[~2022-01-13 22:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-13 20:33 [bug#53238] [PATCH] gnu: tree: Remove stddata feature Olivier Dion via Guix-patches via
2022-01-13 20:44 ` Tobias Geerinckx-Rice via Guix-patches via
2022-01-13 20:57 ` Olivier Dion via Guix-patches via
2022-01-13 22:26 ` Maxim Cournoyer [this message]
2022-01-13 22:33 ` Tobias Geerinckx-Rice via Guix-patches via
2022-01-14 1:55 ` Olivier Dion via Guix-patches via
2022-01-14 2:05 ` Tobias Geerinckx-Rice via Guix-patches via
2022-01-15 14:37 ` bug#53238: " Tobias Geerinckx-Rice via Bug reports for GNU Guix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r19bxofo.fsf_-_@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=53238@debbugs.gnu.org \
--cc=me@tobias.gr \
--cc=olivier.dion@polymtl.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).