From: Brendan Tildesley <mail@brendan.scot>
To: 43367@debbugs.gnu.org
Subject: [bug#43367] [PATCH 2/5] utils: Rename wrapper? to wrapped-program?.
Date: Sun, 13 Sep 2020 15:45:54 +1000 [thread overview]
Message-ID: <20200913054557.12911-2-mail@brendan.scot> (raw)
In-Reply-To: <20200913054557.12911-1-mail@brendan.scot>
* guix/build/utils.scm (wrap-program): The wrapper? procedure is
incorrectly named as it actually checks to see if prog is the
original program that was moved, not the wrapper.
* guix/build/python-build-system: (wrap): Use renamed wrapped-program?.
---
guix/build/python-build-system.scm | 2 +-
guix/build/utils.scm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 62e7a7b305..d1dbbc1de2 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -196,7 +196,7 @@ when running checks after installing the package."
(define (list-of-files dir)
(find-files dir (lambda (file stat)
(and (eq? 'regular (stat:type stat))
- (not (wrapper? file))))))
+ (not (wrapped-program? file))))))
(define bindirs
(append-map (match-lambda
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 822191f4de..4cd227a668 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -90,7 +90,7 @@
patch-/usr/bin/file
fold-port-matches
remove-store-references
- wrapper?
+ wrapped-program?
wrap-program
wrap-script
@@ -1118,8 +1118,8 @@ known as `nuke-refs' in Nixpkgs."
(program wrap-error-program)
(type wrap-error-type))
-(define (wrapper? prog)
- "Return #t if PROG is a wrapper as produced by 'wrap-program'."
+(define (wrapped-program? prog)
+ "Return #t if PROG is a program that was moved and wrapped by 'wrap-program'."
(and (file-exists? prog)
(let ((base (basename prog)))
(and (string-prefix? "." base)
--
2.28.0
next prev parent reply other threads:[~2020-09-13 5:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-13 5:39 [bug#43367] [core-updates]: [PATCH 0/5]: Prevent wrap-progam from double-wrapping Brendan Tildesley
2020-09-13 5:45 ` [bug#43367] [PATCH 1/5] utils: wrap-program: Refuse to wrap .X-real files Brendan Tildesley
2020-09-13 5:45 ` Brendan Tildesley [this message]
2020-09-13 5:45 ` [bug#43367] [PATCH 3/5] glib-or-gtk-build-system: Don't double wrap programs Brendan Tildesley
2020-09-13 5:45 ` [bug#43367] [PATCH 4/5] rakudo-build-system: " Brendan Tildesley
2020-09-13 5:45 ` [bug#43367] [PATCH 5/5] qt-build-system: " Brendan Tildesley
2020-09-13 9:40 ` [bug#43367] [core-updates]: [PATCH 0/5]: Prevent wrap-progam from double-wrapping Danny Milosavljevic
2020-09-13 12:30 ` Brendan Tildesley
2021-04-22 9:06 ` bug#43367: " Ludovic Courtès
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=20200913054557.12911-2-mail@brendan.scot \
--to=mail@brendan.scot \
--cc=43367@debbugs.gnu.org \
/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).