[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/20: installer: slurp: Ignore blank lines in output.
From: |
John Darrington |
Subject: |
15/20: installer: slurp: Ignore blank lines in output. |
Date: |
Thu, 12 Jan 2017 20:41:04 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 6a63413171a8d1250225fed69a00465c37e0c8af
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)))))))
- 02/20: installer: Remove explicit calls to curs-set from pages., (continued)
- 02/20: installer: Remove explicit calls to curs-set from pages., John Darrington, 2017/01/12
- 01/20: installer: Correct behaviour of push-cursor and pop-cursor procedures., John Darrington, 2017/01/12
- 12/20: installer: "Setup" --> "Set up", John Darrington, 2017/01/12
- 03/20: installer: Remove pointless calls to delwin., John Darrington, 2017/01/12
- 14/20: installer: Use "lspci -mm" instead of "lspci -m"., John Darrington, 2017/01/12
- 17/20: installer: Use a cleaner method of detecting wireless capability for ethernet interfaces., John Darrington, 2017/01/12
- 09/20: installer: Make all windows with ports scrollable., John Darrington, 2017/01/12
- 08/20: installer: Ignore case in button accelerators., John Darrington, 2017/01/12
- 05/20: installer: New procedure: page-enter., John Darrington, 2017/01/12
- 11/20: installer: Add installer source files to the manifest of translatables., John Darrington, 2017/01/12
- 15/20: installer: slurp: Ignore blank lines in output.,
John Darrington <=
- 04/20: installer: New procedure "page-leave"., John Darrington, 2017/01/12
- 18/20: guix: Add IFF_RUNNING to exported syscall constants., John Darrington, 2017/01/12
- 20/20: installer: Enable direct scrolling to top or bottom of menus., John Darrington, 2017/01/12
- 19/20: installer: Make the network menu more reliable., John Darrington, 2017/01/12
- 07/20: installer: Rename "Back" buttons to "Cancel"., John Darrington, 2017/01/12
- 13/20: installer: Use guix build syscalls module for network interrogation., John Darrington, 2017/01/12
- 10/20: installer: Rename 'file-browser.scm' to 'key-map.scm'., John Darrington, 2017/01/12
- 06/20: installer: Ensure that the cursor visibility is updated on each page., John Darrington, 2017/01/12
- 16/20: installer: Minor cleanup., John Darrington, 2017/01/12