mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-23 11:09:41 -05:00
packages: Ignore return value of origin snippets.
* guix/packages.scm (patch-and-repack): Ignore return value of SNIPPET and remove warning about non #t return value.
This commit is contained in:
parent
4cebe82fa6
commit
325d00e619
1 changed files with 11 additions and 20 deletions
|
@ -728,26 +728,17 @@ (define (first-file directory)
|
|||
|
||||
(for-each apply-patch '#+patches)
|
||||
|
||||
(let ((result #+(if snippet
|
||||
#~(let ((module (make-fresh-user-module)))
|
||||
(module-use-interfaces!
|
||||
module
|
||||
(map resolve-interface '#+modules))
|
||||
((@ (system base compile) compile)
|
||||
'#+snippet
|
||||
#:to 'value
|
||||
#:opts %auto-compilation-options
|
||||
#:env module))
|
||||
#~#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")))
|
||||
#+(if snippet
|
||||
#~(let ((module (make-fresh-user-module)))
|
||||
(module-use-interfaces!
|
||||
module
|
||||
(map resolve-interface '#+modules))
|
||||
((@ (system base compile) compile)
|
||||
'#+snippet
|
||||
#:to 'value
|
||||
#:opts %auto-compilation-options
|
||||
#:env module))
|
||||
#~#t)
|
||||
|
||||
(chdir "..")
|
||||
|
||||
|
|
Loading…
Reference in a new issue