From patchwork Tue Feb 8 09:51:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 146 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 194CC27BBEA; Tue, 8 Feb 2022 10:38:33 +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.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 DA69B27BBE9 for ; Tue, 8 Feb 2022 10:38:32 +0000 (GMT) Received: from localhost ([::1]:46148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHNtH-0004do-R9 for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 05:38:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHNBG-00029I-VG for guix-patches@gnu.org; Tue, 08 Feb 2022 04:53:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51451) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHNBG-0000E3-L2 for guix-patches@gnu.org; Tue, 08 Feb 2022 04:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHNBG-00057m-Ln for guix-patches@gnu.org; Tue, 08 Feb 2022 04:53:02 -0500 Subject: bug#53548: [PATCH] Harden beautify-description Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 09:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 53548 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Alice BRENON Cc: 53548-done@debbugs.gnu.org, Xinglu Chen , Julien Lepiller Mail-Followup-To: 53548@debbugs.gnu.org, ludo@gnu.org, alice.brenon@ens-lyon.fr Received: via spool by 53548-done@debbugs.gnu.org id=D53548.164431392119584 (code D ref 53548); Tue, 08 Feb 2022 09:53:02 +0000 Received: (at 53548-done) by debbugs.gnu.org; 8 Feb 2022 09:52:01 +0000 Received: from localhost ([127.0.0.1]:45343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHNAH-00055i-Es for submit@debbugs.gnu.org; Tue, 08 Feb 2022 04:52:01 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:35716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHNAF-00055T-Pr for 53548-done@debbugs.gnu.org; Tue, 08 Feb 2022 04:52:00 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 6ECED307; Tue, 8 Feb 2022 10:51:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id weWG5KCLA6-J; Tue, 8 Feb 2022 10:51:52 +0100 (CET) Received: from ribbon (unknown [193.50.110.192]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 1F6AB16C; Tue, 8 Feb 2022 10:51:52 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20220126104139.17df3cbb@ens-lyon.fr> <87ee4n8pu3.fsf@gnu.org> <20220202163731.4e3216f2@ens-lyon.fr> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 20 =?utf-8?b?UGx1dmnDtHNl?= an 230 de la =?utf-8?q?R?= =?utf-8?q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 08 Feb 2022 10:51:51 +0100 In-Reply-To: <20220202163731.4e3216f2@ens-lyon.fr> (Alice BRENON's message of "Wed, 2 Feb 2022 16:37:31 +0100") Message-ID: <87sfstbs94.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 6ECED307 X-Spamd-Result: default: False [0.46 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; R_MIXED_CHARSET(0.56)[subject]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] 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 Hi! Alice BRENON skribis: > From cfb57a40a90bfc31d1b846f3e981469285f1bd7b Mon Sep 17 00:00:00 2001 > From: Alice BRENON > Date: Wed, 26 Jan 2022 09:27:12 +0100 > Subject: [PATCH] guix: import: Harden beautify-description. > > * guix/import/utils.scm (beautify-description): Handle non-string > arguments. > [use-modules]: Explicitly import G_ from (guix i18n) and make (guix ui) > import explicit. > * guix/import/opam.scm: [use-modules] Make imports explicit for module > (guix import utils). Applied. I removed extra space from the message, as shown below. Thanks! Ludo’. diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 934b224bec..9cadbb3d5f 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -244,8 +244,8 @@ (define* (beautify-description description #:optional (length 80)) LENGTH characters." (let ((cleaned (cond ((not (string? description)) - (G_ "This package lacks a description. Run \"info '(guix) - Synopses and Descriptions'\" for more information.")) + (G_ "This package lacks a description. Run \ +\"info '(guix) Synopses and Descriptions'\" for more information.")) ((string-prefix? "A " description) (string-append "This package provides a" (substring description 1)))