ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 11:09:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages: Ignore return value of origin snippets.

Browse source 
* guix/packages.scm (patch-and-repack): Ignore return value of SNIPPET
and remove warning about non #t return value.
This commit is contained in:
Ludovic Courtès 2020-11-24 23:29:19 +01:00
parent 4cebe82fa6
commit 325d00e619
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
guix/packages.scm
View file

@ -728,7 +728,7 @@ (define (first-file directory)
(for-each apply-patch '#+patches) (for-each apply-patch '#+patches)
(let ((result #+(if snippet #+(if snippet
#~(let ((module (make-fresh-user-module))) #~(let ((module (make-fresh-user-module)))
(module-use-interfaces! (module-use-interfaces!
module module
@ -738,16 +738,7 @@ (define (first-file directory)
#:to 'value #:to 'value
#:opts %auto-compilation-options #:opts %auto-compilation-options
#:env module)) #:env module))
#~#t))) #~#t)
;; Issue a warning unless the result is #t.
(unless (eqv? result #t)
(format (current-error-port) "\
## WARNING: the snippet returned `~s'. Return values other than #t
## are deprecated. Please migrate this package so that its snippet
## reports errors by raising an exception, and otherwise returns #t.~%"
result))
(unless result
(error "snippet returned false")))
(chdir "..") (chdir "..")