From patchwork Fri Sep 16 07:32:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 42654 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB8EF27BBEA; Fri, 16 Sep 2022 08:33:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB1FA27BBE9 for ; Fri, 16 Sep 2022 08:33:34 +0100 (BST) Received: from localhost ([::1]:60902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZ5qv-0006Ks-S9 for patchwork@mira.cbaines.net; Fri, 16 Sep 2022 03:33:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZ5qQ-0006JJ-Rh for guix-patches@gnu.org; Fri, 16 Sep 2022 03:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZ5qQ-0000i8-K0 for guix-patches@gnu.org; Fri, 16 Sep 2022 03:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZ5qQ-0003VB-Eo for guix-patches@gnu.org; Fri, 16 Sep 2022 03:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57850] [PATCH 2/2] marionette: Avoid read error when wait-for-file file is empty. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Sep 2022 07:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57850 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 57850@debbugs.gnu.org Received: via spool by 57850-submit@debbugs.gnu.org id=B57850.166331356013405 (code B ref 57850); Fri, 16 Sep 2022 07:33:02 +0000 Received: (at 57850) by debbugs.gnu.org; 16 Sep 2022 07:32:40 +0000 Received: from localhost ([127.0.0.1]:41440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZ5q3-0003U8-Ph for submit@debbugs.gnu.org; Fri, 16 Sep 2022 03:32:40 -0400 Received: from mira.cbaines.net ([212.71.252.8]:41466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZ5q2-0003Tt-09 for 57850@debbugs.gnu.org; Fri, 16 Sep 2022 03:32:38 -0400 Received: from localhost (unknown [134.157.22.165]) by mira.cbaines.net (Postfix) with ESMTPSA id E787027BBEA for <57850@debbugs.gnu.org>; Fri, 16 Sep 2022 08:32:36 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 0b9036b4 for <57850@debbugs.gnu.org>; Fri, 16 Sep 2022 07:32:36 +0000 (UTC) From: Christopher Baines Date: Fri, 16 Sep 2022 09:32:36 +0200 Message-Id: <20220916073236.23634-2-mail@cbaines.net> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220916073236.23634-1-mail@cbaines.net> References: <20220916073236.23634-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Since # can't be read. * gnu/build/marionette.scm (wait-for-file): Return "" if file is empty. --- gnu/build/marionette.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index fd59a4c72f..5ebf783892 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -198,7 +198,14 @@ (define* (wait-for-file file marionette (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) + ;; # can't be read, so convert to the + ;; empty string + "" + content)))) ((> i 0) (sleep 1) (loop (- i 1)))