[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/07: utils: Rename 'wrapper?' to 'wrapped-program?'.
From: |
guix-commits |
Subject: |
03/07: utils: Rename 'wrapper?' to 'wrapped-program?'. |
Date: |
Thu, 22 Apr 2021 08:05:00 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit b2b799e2d8330af934f48bf66afb5114addb4dd7
Author: Brendan Tildesley <mail@brendan.scot>
AuthorDate: Sun Sep 13 15:45:54 2020 +1000
utils: Rename 'wrapper?' to 'wrapped-program?'.
* 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?.
* gnu/packages/ebook.scm (calibre)[arguments]: Likewise.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/ebook.scm | 2 +-
guix/build/python-build-system.scm | 2 +-
guix/build/utils.scm | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 4731c0f..22a4b87 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -324,7 +324,7 @@ sip-include-dirs = [\"" pyqt "/share/sip" "\"]")))
;; rather than create ..calibre-real-real-s. For more
;; information see: https://issues.guix.gnu.org/43249.
(find-files "." (lambda (file stat)
- (not (wrapper? file)))))))
+ (not (wrapped-program? file)))))))
#t)))))
(home-page "https://calibre-ebook.com/")
(synopsis "E-book library management software")
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index 8ade1d5..5b1339d 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -225,7 +225,7 @@ 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 6c37021..a15beac 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -96,7 +96,7 @@
patch-/usr/bin/file
fold-port-matches
remove-store-references
- wrapper?
+ wrapped-program?
wrap-program
wrap-script
@@ -1227,8 +1227,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)
- branch core-updates updated (a24562a -> a738a66), guix-commits, 2021/04/22
- 01/07: gremlin: 'elf-dynamic-info' returns a file name rathern than a dynamic entry., guix-commits, 2021/04/22
- 02/07: packages: Fix patch-and-repack for ZIP files., guix-commits, 2021/04/22
- 03/07: utils: Rename 'wrapper?' to 'wrapped-program?'.,
guix-commits <=
- 04/07: glib-or-gtk-build-system: Don't double wrap programs., guix-commits, 2021/04/22
- 05/07: rakudo-build-system: Don't double wrap programs., guix-commits, 2021/04/22
- 07/07: utils: wrap-program: Refuse to wrap .X-real files., guix-commits, 2021/04/22
- 06/07: qt-build-system: Don't double wrap programs., guix-commits, 2021/04/22