From 48095aa751cef4202e280c2d0ffa35a8d1cb5c12 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 19 Sep 2021 20:03:10 +0200 Subject: [PATCH 1/3] guix: minetest-build-system: Report all error lines before failing * minetest-build-system.scm (check): Report all error lines before failing. --- guix/build/minetest-build-system.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 477cc3d1d0..badc45112b 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -23,6 +23,7 @@ #:use-module (ice-9 rdelim) #:use-module (ice-9 receive) #:use-module (ice-9 regex) + #:use-module (ice-9 exceptions) #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module ((guix build copy-build-system) #:prefix copy:) #:export (%standard-phases @@ -199,20 +200,25 @@ auth_backend = sqlite3 (define (stop? line) (and (string? line) (string-contains line "ACTION[Server]: singleplayer [127.0.0.1] joins game."))) - (let loop () - (match (read-line port) - ((? error? line) - (error "minetest raised an error: ~a" line)) - ((? stop?) + (let loop ((errors '())) + (match `(,(read-line port) ,errors) + (((? error? line) errors) + (loop `(,line ,@errors))) + (((? string? line) errors) + (display line) + (newline) + (loop errors)) + (((? stop?) ()) (kill pid SIGINT) (close-port port) (waitpid pid)) - ((? string? line) - (display line) - (newline) - (loop)) - ((? eof-object?) - (error "minetest didn't start")))))))) + (((? eof-object?) ()) + (error "minetest didn't start")) + (((or (? stop?) (? eof-object?)) errors) + (raise-exception + (apply make-exception + (map make-exception-with-message + (reverse errors))))))))))) (define %standard-phases (modify-phases gnu:%standard-phases -- 2.33.0