From patchwork Mon Apr 7 20:53:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41422 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 40D0727BC4B; Mon, 7 Apr 2025 21:55:11 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 B2A4127BC49 for ; Mon, 7 Apr 2025 21:55:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1tUp-0000lF-FT; Mon, 07 Apr 2025 16:55:07 -0400 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 1u1tUl-0000jX-My for guix-patches@gnu.org; Mon, 07 Apr 2025 16:55:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u1tUl-0004wm-Ce for guix-patches@gnu.org; Mon, 07 Apr 2025 16:55:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=4aJjXrwDbZ4sp281FiPNezLNvyFQYdjuRIIxcFcYraY=; b=nOSvkgyEB5hPhAzTiSl2UM/SW58CucjjtFCGoZnz0xXIGUjXwGoseO/XMlWxHBh0aVdxcU+cTfAl4B75vNSqrtjQfO8f515JCCgeEWKHSQhpZpRAM2Vjmo+KbDTz2AgmKiSLfEbKCrakv9kSxF693/Cxjx3f7FIm90w27B31uzQXI7UjFKYWwfIgVA1DACzAG6FCOc1PPxodTiJA3oC1QRX8L6p/IVA5McL9Bit0Gwam287iBkOVsaDb+NY4ZO2KOKKLqCD2VGpfPWV+iKEuuiTkmUR3VOjBfD3A8wQypPtcOgV9fGIXPCrjCrL0LS2oKQXtxo7n5dswxT21eHxiZA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u1tUl-0007fj-8L for guix-patches@gnu.org; Mon, 07 Apr 2025 16:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75151] [PATCH v2] import/utils: beautify-description: Validate argument References: In-Reply-To: Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Apr 2025 20:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75151 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75151@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 75151-submit@debbugs.gnu.org id=B75151.174405929829450 (code B ref 75151); Mon, 07 Apr 2025 20:55:03 +0000 Received: (at 75151) by debbugs.gnu.org; 7 Apr 2025 20:54:58 +0000 Received: from localhost ([127.0.0.1]:57190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1tUg-0007et-54 for submit@debbugs.gnu.org; Mon, 07 Apr 2025 16:54:58 -0400 Received: from mail-bn8nam04olkn20802.outbound.protection.outlook.com ([2a01:111:f403:2c08::802]:56064 helo=NAM04-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u1tUd-0007eN-Qm for 75151@debbugs.gnu.org; Mon, 07 Apr 2025 16:54:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hexmICKVLnDnkTjQcHdsqyh1ksZmcJgbrxfsXactYFN132MjzWOssK6Zzcu8ux/dLQDGZOW2unwJUHnO2buZMzSAjQDjwZ0k6sT4YZQzwhIYA9ih8g3OExzpADGzH5xn4HHslx/WwfhBF2tZkV68Gu4dNbRQ8jIbhph7FKxfeY3tcvKgLKEuVL+2ssZhRm5AC+MR4Eb+4fOI0y/LjEzGvyXyWrdzWqozWioATPyHbEMzS0T2QX3njt0URfr8YIghjjep25bBjiJFMIjcd9ip2v5IDX2k5W6Wp8h7tBBLtuEc8z25Crk7L+lnUqsFmxfib1qe67myZikPU3c5OqvdjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4aJjXrwDbZ4sp281FiPNezLNvyFQYdjuRIIxcFcYraY=; b=kLsRVLvHqwKAqxbZeKnx1XLQXRmPlLcReXCB8g9Ju2rl4Tg0hn3wz+2a2HrLvFj3l+EQVsfPF1TXOGrtOvgGcRQ5Lgx929P2IIvBFFihZnTVNNh29/wqfnQVAPNAP7jJXSt2r9s90pebgbs03Y36fI763JlzKmTg906ygCYrz2l3Z1RTOBKpuD57tcWJ9vdeaXYKCHNWYCsTUY7h1KRaQP+VsGMkQA+u0hHKMv9dP1zd3vjFYJ7ENvq/LOyL5bM06b0siUf7OwHkcQG9Uw/AdHSsHqXE6xeaeNBGNI7sDotwQ0KpWS43INvBdmYzoRESDeVILFdDBN23t5Y0IE/BQw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4aJjXrwDbZ4sp281FiPNezLNvyFQYdjuRIIxcFcYraY=; b=KXXOxhHj9OYZaYxrvJwmKRdJZSfoZVhLuYXhamfFOT/f0SVhv+aPhRbcWyH5tzTrUluXvC34ioIrv0LeTuMW/dFjpACyK1eaTQcazDHww+GUrFk9gtWhJ5KVY1qqPSJHqk7ewHLRIUCosvXbGkhy/TS0Js3xE2ej0ZveqTf94PNpp8LhbVaX7Bye24KdR82uJNF/mvayxa5WsaeGJNceROA3qcGhqDxBa0Fu1wHh56oWBmiWxGXJexPwoev40daXt87hFSP7mTDCqZlxAuVRV3aNtwFWwRbvGETlQJwG6V/fnaGTtxRrH13ixC6u8dzRpCmhDwZFVPsrTVU9XRJm4g== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by LV3PR84MB3661.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:408:20f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Mon, 7 Apr 2025 20:54:47 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8606.033; Mon, 7 Apr 2025 20:54:47 +0000 From: Morgan Smith Date: Mon, 7 Apr 2025 16:53:52 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: YQZPR01CA0157.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:8c::6) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <16801d320f4923afbbed6ccfd08802552fddc335.1744059231.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|LV3PR84MB3661:EE_ X-MS-Office365-Filtering-Correlation-Id: 77851a04-4296-4370-2a58-08dd76166e31 X-Microsoft-Antispam: BCL:0; ARA:14566002|7092599003|5072599009|8060799006|19110799003|15080799006|461199028|440099028|3412199025|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: qvRcXT4LRFQ8Oox87bS/7HnCgatpYBXwssWHBKwO7j+mz/cIKwWjKP82/XNdyhOoYI/sMH+lVtdfXcr6jE9QG2cQguQdDtHU2UF67JsrkcRTrJH8VKaTKH97TRle8UVrKM1wkCYvVCO/rM8YfkPVGGn7O6y4KiVsaN+/xV56UJ8RyoP6XEYXEoSRuTuY+a0FmKXGsOIKmusHhC0nss9qj2BQmjFCbNJsvN3QnJOCwWVDISNbWhe/bSgypHeZYwMFR2jDTRPT+pg0hHdCv30GtmGy0iemDRpMutLWZmPk6dDm6GLKbZTycrhiPfDABjPUpUdO16m2K1pJL7ES5qEaScCFuLxyLdjckAnFvdecCxdq4JB2tfqbW1kfzNqNro3+AYqLGahUy/MRZtR7/eKsvGpdcktabSoXWuymII/pA9VUpLq9Roe6Dj8mePz9GsGuUCQ+nwNKG5IwC3IQ1F2ikPbNL5VQM7cBb+Z3AD+5GiI9+mj3dwpbF4XLXpgXOf/7zjrMZdL9kKnz/4GJI/pvbRxmmIaGYcAZhKhe1twXxgeQspQnhsKrORgkMTPN8LTpGufvb1vE2Tc/ah7vFUb6VyhZ6R0Sy0eceq6RMG+zUjVXmZU7jsPH3u4wCXuaYGU5+eetiBcaa5a7Ojmo8P34FrF7M8YbmNZfpR71oyFMHe5pyo4uLOwb5WfMwM01et+SpIEqmabJr3jh5zGkbmxNiz7f91Q3RriRTZX0YxfeHrNKxAEIzvPAsxF5aAz+mQJuS1Tf2EzNN1za/htu9jC6WppBFMGscOGAWfrD2Q1B8sdA8Az87bCArpp+uuFAc7m9vwOAIfq+fDBueBMU7bBauivY/f5vt3SKmis3EQcxUfIz9+PXKmtfQkywnvQdZ5TePvtHs+C9IKA9SuLCfxj86jFSzeykBaohQ+z2Cef/y+Af3Uj8eqTeys8UwkYt9l+mZsb6bWzRSMNCnuJhFho71qeEzO2QZuuIPOqrrLnVPAqQT09yKcIx/0/0HM8EfXf7+LJkVvgA7DTXSSmz9HXHbmZHri3Jux2/+rLS562iRC+gQndGeXqvsuOQMRp3zVFPKBWbQbOmGyn8HE/1RByUwTo9vjZpoLVdnZ3UjG9Ni+xhdRuvnsB6+F0sVsvFXE6GRz0EjfOfBtvhstmMMNLsyLxtyBuckmDSSgw5bW7aMT0= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vC6akXkjqvdRfB8fcL8eBqI2ArAFeYqaanVxjeTVt0oTSApKyl8Jlzf+L4OC6HRQ2C+9VvqDQcpMI2+FMhfRnBP7UTWQn36hj3NH9qcD8Ry+wrdF3pTKTg90v0XQS/+O62Kx5tgcuWqQsYrVaoniwVPXQtEWxLoLV8u7p0kAAtDAGPgem096NXRYrJYBFu+zuBG7Z8ck9IyNpq8vhNmfadIhW44q/TZ29ZoFSGLpvtj9cIgqUwzPK0erXgh5jI3tzmQ8BigaZxF1MCX4WscXw26A4XK+pa9KVVs04uRw9av26jtuXOCIaUb3sIpo87XbfpVK2mBs1onuozI8svBPd9lN83047FTsl3gXR6xj3/wS5Wm2iJmu/JQUfy05wlglbFDLxKQcjzraTqV1UiJhwTKOrUGPUS/Usi1pK0hsZKnCtfP3UciM3fxhxKvhEe1tX2maY97A3Xa4Rqn/la1PhtLs+mFs+v9zmZVDp+zLZXYdGwEAjt1/mA8CRAQBbDZA7WQRpgrGvhDMeOsv0XfN9xJ8pKEOdebJqRyszMZLaSDNZANnVAYfy9w583cH9xYqCoc8Q6AtcV6zbwMSLd1woM35lrmdS8p9vDtSKF/Vs42YKANHKWW0XNIjBjlCa8GxR6VPIJVYwxnW5pdZESvo68mJK/5+qrTrivqX8OgaEkWDhZDbSukGuri7lcHd2v6CxfxbAB86xtlnHwHI5FsDKymyRpDvFDYfZ0FoShoy5yKpEnsJghiA8ePzGuI/mcB6SSeiVWDzJvsU6w16OgQOy4LPp4RMVLGIhTK/MEq+cIFiOWzveG1YRyTSKBsGmEmQ87BbDAKI5gzOUOHUBB0JE1OgavuFmiKuav2yKlrGO62m03YX4BREon1CRDRuyFh53997pmwvrURPLl637j3eX7dw47tZmeq/x2OzgyTuZTDD5uILHyNCIOyGqoaqlLd4hwt/Ir7QpVryphkIildHBVvmPKpoxHoRCeP+K2nAJypRC1z8L0YaofE+t9Nnju24E/crQEiYfy4AyrFldBVasQMS/6ocPfRTM4EbeeKv72QCpEwJWrpHC7Krto69U0KEz5mhekvzkZBo6rxblMculd5pv4F1UlCMjiEk1oUYbfsX3wdsWLXp28MirW2mAJFXsm3DjN1x1JMZlAwsW6hDiW/i5N1UDWW8kRqqk9QoN1HddDEtRcHpfSkF6P8tdTx6lgbZQfsYrvs2zTnrqUP8udEruO92681b4N0UZAs1mvklMzCrOCb5iFzE44BUIlx8 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77851a04-4296-4370-2a58-08dd76166e31 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2025 20:54:47.0763 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR84MB3661 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/import/utils.scm (beautify-description): Fix broken check for non-strings. Add a check for empty strings. * tests/import-utils.scm: Add two tests. Change-Id: Idf86df02aeb850fcc8808b7c9251082c1f816656 --- Resending after rebasing this. guix/import/utils.scm | 8 ++++---- tests/import-utils.scm | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) base-commit: 666a6cfd88b3e5106a9180e06ea128db8084be0e diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 38c986b4d5..0ef84c9cdf 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -331,9 +331,9 @@ (define* (beautify-description description #:optional (length 80)) "Improve the package DESCRIPTION by turning a beginning sentence fragment into a proper sentence and by using two spaces between sentences, and wrap lines at LENGTH characters." - (unless (string? description) - (G_ "This package lacks a description. Run \ -\"info '(guix) Synopses and Descriptions'\" for more information.")) + (if (or (not (string? description)) (string=? (string-trim-both description) "")) + (G_ "This package lacks a description. Run \ +\"info '(guix) Synopses and Descriptions'\" for more information.") (let* ((fix-word (lambda (word) @@ -410,7 +410,7 @@ (define* (beautify-description description #:optional (length 80)) ". " ". "))) 'post) - length))) + length)))) (define (beautify-synopsis synopsis) "Improve the package SYNOPSIS." diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 221866e871..273f18254e 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -31,6 +31,16 @@ (define-module (test-import-utils) (test-begin "import-utils") +(test-equal "beautify-description: empty string" + "This package lacks a description. Run \ +\"info '(guix) Synopses and Descriptions'\" for more information." + (beautify-description "")) + +(test-equal "beautify-description: not a string" + "This package lacks a description. Run \ +\"info '(guix) Synopses and Descriptions'\" for more information." + (beautify-description '())) + (test-equal "beautify-description: use double spacing" "\ Trust me Mr. Hendrix, M. Night Shyamalan et al. \