From 325d00e61993ddaa674f6e85e099d570866f8258 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 24 Nov 2020 23:29:19 +0100
Subject: 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.
---
 guix/packages.scm | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'guix')

diff --git a/guix/packages.scm b/guix/packages.scm
index bdd03a6d91..7d8d02c30e 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -728,26 +728,17 @@ specifies modules in scope when evaluating SNIPPET."
 
               (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 "..")
 
-- 
cgit v1.2.3