From patchwork Wed Mar 8 15:55:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47798 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 1FBD616E31; Wed, 8 Mar 2023 15:57:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 8FABA16E0D for ; Wed, 8 Mar 2023 15:57:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZwA4-0005WJ-Vd; Wed, 08 Mar 2023 10:57:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZwA2-0005W4-Iv for guix-patches@gnu.org; Wed, 08 Mar 2023 10:57:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZwA2-00025d-AT for guix-patches@gnu.org; Wed, 08 Mar 2023 10:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZwA2-0008Oa-66 for guix-patches@gnu.org; Wed, 08 Mar 2023 10:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62056] [PATCH] guix: Only issue erase-current-line sequence for ttys. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Mar 2023 15:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62056 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62056@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167829098832227 (code B ref -1); Wed, 08 Mar 2023 15:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Mar 2023 15:56:28 +0000 Received: from localhost ([127.0.0.1]:50001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZw9T-0008Ni-Pa for submit@debbugs.gnu.org; Wed, 08 Mar 2023 10:56:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:34510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZw9S-0008Na-40 for submit@debbugs.gnu.org; Wed, 08 Mar 2023 10:56:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZw9R-0005UF-QG for guix-patches@gnu.org; Wed, 08 Mar 2023 10:56:25 -0500 Received: from smtpm5.myservices.hosting ([185.26.105.236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZw9P-0001mk-B9 for guix-patches@gnu.org; Wed, 08 Mar 2023 10:56:25 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id B269020CB7 for ; Wed, 8 Mar 2023 16:56:07 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 5D5E8800A4; Wed, 8 Mar 2023 16:56:07 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 5MDkHJYR6CN5; Wed, 8 Mar 2023 16:56:04 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 13C5B8009E; Wed, 8 Mar 2023 16:56:04 +0100 (CET) From: Bruno Victal Date: Wed, 8 Mar 2023 15:55:56 +0000 Message-Id: <6a78ee837fe579d6b1beaeda54beddba3c05fd2e.1678290800.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.105.236; envelope-from=mirai@makinata.eu; helo=smtpm5.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/progress.scm (erase-current-line): Only issue erase-current-line sequence for ttys. --- Avoids cluttering log lines with �[K when output is logged to a file. guix/progress.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) base-commit: 85d4e8af5baf9b0a9cadf95d802674d0254433da diff --git a/guix/progress.scm b/guix/progress.scm index 33cf6f4a1a..a1cdd25557 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Steve Sprang ;;; Copyright © 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -209,9 +210,12 @@ (define* (progress-bar % #:optional (bar-width 20)) (string (progress-bar-style-stop bar-style))))) (define (erase-current-line port) - "Write an ANSI erase-current-line sequence to PORT to erase the whole line and -move the cursor to the beginning of the line." - (display "\r\x1b[K" port)) + "When @var{port} is interactive, write an ANSI erase-current-line sequence +to erase the whole line and move the cursor to the beginning of the line, +otherwise write a newline." + (if (isatty? port) + (display "\r\x1b[K" port) + (newline port))) (define* (display-download-progress file size #:key