From e9b23fe8bd7c78da1b7b1ed8fd86830260fdbb20 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Fri, 16 Mar 2018 06:04:38 -0400
Subject: build-system/gnu: Return a boolean from all phase procedures.

* guix/build/gnu-build-system.scm (patch-source-shebangs)
(patch-generated-file-shebangs, strip): Return #t.
(validate-runpath): Raise an exception if validation fails.  Never return #f.
---
 guix/build/gnu-build-system.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'guix')

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 92d5cb33b7..f49de0e7f1 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -223,7 +223,8 @@ (define* (patch-source-shebangs #:key source #:allow-other-keys)
                         (lambda (file stat)
                           ;; Filter out symlinks.
                           (eq? 'regular (stat:type stat)))
-                        #:stat lstat)))
+                        #:stat lstat))
+  #t)
 
 (define (patch-generated-file-shebangs . rest)
   "Patch shebangs in generated files, including `SHELL' variables in
@@ -238,7 +239,9 @@ (define (patch-generated-file-shebangs . rest)
                         #:stat lstat))
 
   ;; Patch `SHELL' in generated makefiles.
-  (for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$")))
+  (for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$"))
+
+  #t)
 
 (define* (configure #:key build target native-inputs inputs outputs
                     (configure-flags '()) out-of-source?
@@ -461,7 +464,8 @@ (define (strip-dir dir)
                                   (let ((sub (string-append dir "/" d)))
                                     (and (directory-exists? sub) sub)))
                                 strip-directories)))
-                 outputs))))
+                 outputs)))
+  #t)
 
 (define* (validate-runpath #:key
                            (validate-runpath? #t)
@@ -504,10 +508,11 @@ (define (file=? file1 file2)
                                  (filter-map (sub-directory output)
                                              elf-directories)))
                               outputs)))
-        (every* validate dirs))
-      (begin
-        (format (current-error-port) "skipping RUNPATH validation~%")
-        #t)))
+        (unless (every* validate dirs)
+          (error "RUNPATH validation failed")))
+      (format (current-error-port) "skipping RUNPATH validation~%"))
+
+  #t)
 
 (define* (validate-documentation-location #:key outputs
                                           #:allow-other-keys)
-- 
cgit v1.2.3