nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui: Do not filter hash mismatch lines. 

Reported by Pjotr Prins <pjotr.public12@thebird.nl>.

* guix/ui.scm (build-output-port): Add pattern for hash mismatch error; be
more careful with error messages in verbose mode.
This commit is contained in:
Ricardo Wurmus 2018-09-11 22:16:24 +02:00
parent 4a67079f71
commit f72e5f93b7
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
guix/ui.scm
View File

@ -1708,12 +1708,26 @@ phase announcements and replaces any other output with a spinner."
(string-append (string-append
(proc "Building " 'BLUE 'BOLD) (proc "Building " 'BLUE 'BOLD)
(match:substring m 2) "\n"))) (match:substring m 2) "\n")))
("^(@ build-failed) (.*) (.*)" ,(if verbose?
;; Err on the side of caution: show everything, even
;; if it might be redundant.
`("^(@ build-failed)(.+)"
#:transform #:transform
,(lambda (m) ,(lambda (m)
(string-append (string-append
(proc "Build failed: " 'RED 'BOLD) (proc "Build failed: " 'RED 'BOLD)
(match:substring m 2) "\n"))) (match:substring m 2))))
;; Show only that the build failed.
`("^(@ build-failed)(.+) -.*"
#:transform
,(lambda (m)
(string-append
(proc "Build failed: " 'RED 'BOLD)
(match:substring m 2)
"\n"))))
;; NOTE: this line contains "\n" characters.
("^(sha256 hash mismatch for output path)(.*)"
RED BLACK)
("^(@ build-succeeded) (.*) (.*)" ("^(@ build-succeeded) (.*) (.*)"
#:transform #:transform
,(lambda (m) ,(lambda (m)