From 4932444387a3ea656e3d64829b3da174c98006ea Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 14 Nov 2025 16:39:43 +0900 Subject: [PATCH] lint: Fix regressions in tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a regression introduced with commit 7752580a33 ("guix: lint: Check end of sentences for a period."). * guix/lint.scm (check-description-style): Do not emit warning when the description is empty or ends with trailing whitespace. * tests/lint.scm ("description: invalid Texinfo markup") ("description: may start with texinfo markup") ("description: may not contain trademark signs: ™") ("description: may not contain trademark signs: ®"): Add period. Fixes: #4222 Change-Id: Ib10bcf324cb55b39a88c0c67875a40a59c1d4c18 --- guix/lint.scm | 4 +++- tests/lint.scm | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index ad639a63f75..a111a854ee6 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -398,7 +398,9 @@ superfluous when building natively and incorrect when cross-compiling." (define (check-ends-with-period description) "Checks that a description field ends with a period." - (if (not (string-suffix? "." description)) + (if (not (or (string-null? description) ;check-not-empty + (string-suffix? " " description) ;check-no-trailing-whitespace + (string-suffix? "." description))) (list (make-warning package (G_ "description should end with a period") diff --git a/tests/lint.scm b/tests/lint.scm index f712c38c3fd..1f38f931c8a 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -119,7 +119,7 @@ "Texinfo markup in description is invalid" (single-lint-warning-message (check-description-style - (dummy-package "x" (description (identity "f{oo}b@r")))))) + (dummy-package "x" (description (identity "f{oo}b@r.")))))) (test-equal "description: does not start with an upper-case letter" "description should start with an upper-case letter or digit" @@ -131,7 +131,7 @@ (test-equal "description: may start with texinfo markup" '() (check-description-style - (dummy-package "x" (description "@emph{Maxwell Equations of Software}")))) + (dummy-package "x" (description "@emph{Maxwell Equations of Software}.")))) (test-equal "description: may start with a digit" '() @@ -187,14 +187,14 @@ "description should not contain trademark sign '™' at 20" (single-lint-warning-message (let ((pkg (dummy-package "x" - (description "Does The Right Thing™")))) + (description "Does The Right Thing™.")))) (check-description-style pkg)))) (test-equal "description: may not contain trademark signs: ®" "description should not contain trademark sign '®' at 17" (single-lint-warning-message (let ((pkg (dummy-package "x" - (description "Works with Format®")))) + (description "Works with Format®.")))) (check-description-style pkg)))) (test-equal "description: suggest ornament instead of quotes"