[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: build-self: Add missing 'close-pipe' call.
From: |
Ludovic Courtès |
Subject: |
01/02: build-self: Add missing 'close-pipe' call. |
Date: |
Sun, 8 Apr 2018 16:13:39 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit f27a7128406f768fc8900144cafafe00aa2d7743
Author: Ludovic Courtès <address@hidden>
Date: Sun Apr 8 21:11:37 2018 +0200
build-self: Add missing 'close-pipe' call.
* build-aux/build-self.scm (build): Call 'close-pipe'.
---
build-aux/build-self.scm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 5ec76a5..bccb7a9 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -277,14 +277,16 @@ files."
(mbegin %store-monad
(show-what-to-build* (list build))
(built-derivations (list build))
- (let ((pipe (begin
- (setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive
- (open-pipe* OPEN_READ
- (derivation->output-path build)
- source system))))
- (match (get-string-all pipe)
+ (let* ((pipe (begin
+ (setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and
drive
+ (open-pipe* OPEN_READ
+ (derivation->output-path build)
+ source system)))
+ (str (get-string-all pipe))
+ (status (close-pipe pipe)))
+ (match str
((? eof-object?)
- (error "build program failed" build))
+ (error "build program failed" (list build status)))
((? derivation-path? drv)
(mbegin %store-monad
(return (newline (current-output-port)))