[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: packages: patch-and-repack: Fix snippet handling.
From: |
Mark H. Weaver |
Subject: |
01/01: packages: patch-and-repack: Fix snippet handling. |
Date: |
Fri, 16 Mar 2018 05:29:27 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 00d9494d80d70aac8c42bfe1cb2b70349ad7c90c
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 05:17:30 2018 -0400
packages: patch-and-repack: Fix snippet handling.
This is a followup to commit 5003aeaf2560d6ddebcf980a94785fba77e00f34.
* guix/packages.scm (patch-and-repack): For the snippet, generate a single
boolean expression for 'unless', instead of the list of expressions which
had
previously been spliced into an 'and' form (prior to commit 5003aea).
---
guix/packages.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 41d98e1..0e18f52 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -566,17 +566,17 @@ specifies modules in scope when evaluating SNIPPET."
(for-each apply-patch '#+patches)
- (unless #+@(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)))
- #~())
+ (unless #+(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)
(format (current-error-port)
"snippet returned false, indicating failure~%"))