jmd pushed a commit to branch wip-installer
in repository guix.
commit 6a63413171a8d1250225fed69a00465c37e0c8af
Author: John Darrington <j...@gnu.org>
Date: Wed Jan 11 07:36:51 2017 +0100
installer: slurp: Ignore blank lines in output.
* gnu/system/installer/utils.scm (slurp): Ignore blank lines in output.
---
gnu/system/installer/utils.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/system/installer/utils.scm b/gnu/system/installer/utils.scm
index 079c264..6de519b 100644
--- a/gnu/system/installer/utils.scm
+++ b/gnu/system/installer/utils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 John Darrington <j...@gnu.org>
+;;; Copyright © 2016, 2017 John Darrington <j...@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -193,7 +193,10 @@ which will process each string before returning it."
(let ((l (read-line port)))
(if (eof-object? l)
(reverse line-list)
- (lp (cons (if proc (proc l) l) line-list))))))
+ (lp
+ (if (string= l "") ;; Ignore blank lines
+ line-list
+ (cons (if proc (proc l) l) line-list)))))))
