[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
86/197: installer: slurp: Ignore blank lines in output.
From: |
Danny Milosavljevic |
Subject: |
86/197: installer: slurp: Ignore blank lines in output. |
Date: |
Mon, 3 Jul 2017 20:37:05 -0400 (EDT) |
dannym pushed a commit to branch wip-installer-2
in repository guix.
commit 0f3f14f626e55ada127503977aa3aa7091f82ea2
Author: John Darrington <address@hidden>
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 <address@hidden>
+;;; Copyright © 2016, 2017 John Darrington <address@hidden>
;;;
;;; 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)))))))
- 55/197: installer: Use global variable instead of string literal for "/gnu"., (continued)
- 55/197: installer: Use global variable instead of string literal for "/gnu"., Danny Milosavljevic, 2017/07/03
- 54/197: installer: Change the order of the filesystem task conditions., Danny Milosavljevic, 2017/07/03
- 60/197: installer: Do not allow forms to set the cursor visibility., Danny Milosavljevic, 2017/07/03
- 56/197: installer: Do not use /tmp for holding the configuration., Danny Milosavljevic, 2017/07/03
- 66/197: installer: Add option to final page to reboot the system., Danny Milosavljevic, 2017/07/03
- 71/197: installer: Add confidence indicator., Danny Milosavljevic, 2017/07/03
- 67/197: installer: Add predicate for the network task., Danny Milosavljevic, 2017/07/03
- 74/197: installer: Remove explicit calls to curs-set from pages., Danny Milosavljevic, 2017/07/03
- 64/197: installer: Make setting up of the network a prerequisite., Danny Milosavljevic, 2017/07/03
- 80/197: installer: Ignore case in button accelerators., Danny Milosavljevic, 2017/07/03
- 86/197: installer: slurp: Ignore blank lines in output.,
Danny Milosavljevic <=
- 76/197: installer: New procedure "page-leave"., Danny Milosavljevic, 2017/07/03
- 84/197: installer: Use guix build syscalls module for network interrogation., Danny Milosavljevic, 2017/07/03
- 94/197: installer: Add the notion of uuids to prospective filesystems., Danny Milosavljevic, 2017/07/03
- 89/197: installer: Make the network menu more reliable., Danny Milosavljevic, 2017/07/03
- 90/197: installer: Enable direct scrolling to top or bottom of menus., Danny Milosavljevic, 2017/07/03
- 78/197: installer: Ensure that the cursor visibility is updated on each page., Danny Milosavljevic, 2017/07/03
- 107/197: installer: Do not allow the creation of invalid file-system specificaitons., Danny Milosavljevic, 2017/07/03
- 57/197: installer: Add a console-keymap service., Danny Milosavljevic, 2017/07/03
- 69/197: installer: Remove "continue" button from host name page., Danny Milosavljevic, 2017/07/03
- 58/197: installer: Add flags to indicate network interface status., Danny Milosavljevic, 2017/07/03