me/guix
Archived
1
0
Fork 0
Code Activity

marionette: Avoid read error when wait-for-file file is empty.

Browse source 
Since #<eof> can't be read.

* gnu/build/marionette.scm (wait-for-file): Return "" if file is empty.

Partially-Fixes: https://issues.guix.gnu.org/57827
This commit is contained in:
Christopher Baines 2022-09-16 09:20:25 +02:00
parent 0f46d4f147
commit ad5584bf25
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/build/marionette.scm
View file

@ -198,7 +198,14 @@ FILE has not shown up after TIMEOUT seconds, raise an error."
(match (marionette-eval
`(let loop ((i ,timeout))
(cond ((file-exists? ,file)
(cons 'success (call-with-input-file ,file ,read)))
(cons 'success
(let ((content
(call-with-input-file ,file ,read)))
(if (eof-object? content)
;; #<eof> can't be read, so convert to the
;; empty string
""
content))))
((> i 0)
(sleep 1)
(loop (- i 1)))