From patchwork Mon Dec 2 22:34:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Wicki X-Patchwork-Id: 34391 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 042A927BBEA; Mon, 2 Dec 2024 22:35:18 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 8DA0E27BBE2 for ; Mon, 2 Dec 2024 22:35:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIF0Y-0007HB-FX; Mon, 02 Dec 2024 17:35:10 -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 1tIF0S-0007Gq-VO for guix-patches@gnu.org; Mon, 02 Dec 2024 17:35:05 -0500 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 1tIF0Q-00051W-J2 for guix-patches@gnu.org; Mon, 02 Dec 2024 17:35:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=60KzvQ+fbwLJVsi+gsPjA1HtfLTZH+OYVbBaT/Gco1Q=; b=PStYQljtYeKYs7i+Wv50MdFfngkJVh09ApS5BfAh6r8oNdhHE8tRKXQogNVlcECg8nYchBVQlzpnMtkXIjq6cKlRtNf4vb7n9rKRJXS12AkNZZFGgQ/kJucfoG86HTb0hE8dF+I4ib/UHKuX4R1vXP1ygHvFRFyh5t2a6NxBN5mbU9U40itPK0xlH2z8odhJv/tT+HIaxG5sXnAyZvwRlG1M6UBoX9xc+9u95A99wvJhgB57rbrl6GMeUfZF+AjaCqT7gzKvjlXYGs1vY2JVO5JjoYTQTnM9Bd9qqv8FjE7IwEXlEOcySRjfEyX9e2pDcLVAcmWykhjTjJ8LOetXbg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIF0Q-0003ts-7o for guix-patches@gnu.org; Mon, 02 Dec 2024 17:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74459] [PATCH v2 1/7] guix: lint: Fix indentation. Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2024 22:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74459@debbugs.gnu.org Received: via spool by 74459-submit@debbugs.gnu.org id=B74459.173317885614907 (code B ref 74459); Mon, 02 Dec 2024 22:35:02 +0000 Received: (at 74459) by debbugs.gnu.org; 2 Dec 2024 22:34:16 +0000 Received: from localhost ([127.0.0.1]:56861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIEzf-0003sM-Q2 for submit@debbugs.gnu.org; Mon, 02 Dec 2024 17:34:16 -0500 Received: from cotopaxi.ee.ethz.ch ([129.132.148.196]:42393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIEze-0003s1-CK for 74459@debbugs.gnu.org; Mon, 02 Dec 2024 17:34:15 -0500 Received: from localhost (antispam.ee.ethz.ch [129.132.2.16]) by cotopaxi.ee.ethz.ch (Postfix) with ESMTP id 7F2251FFFF for <74459@debbugs.gnu.org>; Mon, 2 Dec 2024 23:34:07 +0100 (CET) X-Virus-Scanned: by amavisd at antispam.ee.ethz.ch Received: from cotopaxi.ee.ethz.ch ([129.132.148.196]) by localhost (antispam.ee.ethz.ch [129.132.2.16]) (amavisd-new, port 10028) with ESMTP id 9T5Prdr4eVtv for <74459@debbugs.gnu.org>; Mon, 2 Dec 2024 23:34:06 +0100 (CET) Received: from blackbox (212-51-128-25.fiber7.init7.net [212.51.128.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by cotopaxi.ee.ethz.ch (Postfix) with ESMTPSA for <74459@debbugs.gnu.org>; Mon, 2 Dec 2024 23:34:06 +0100 (CET) Date: Mon, 2 Dec 2024 23:34:03 +0100 From: Gabriel Wicki Message-ID: References: <87zfliywiw.fsf@gnu.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87zfliywiw.fsf@gnu.org> 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/lint.scm(check-synopsis-style): Add white space. * tests/lint.scm: Fix indentation. --- guix/lint.scm | 2 +- tests/lint.scm | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) base-commit: 33665c52c4670bc3b4d337c89ac9cc6c4c69b26f diff --git a/guix/lint.scm b/guix/lint.scm index 8c6c20c723..31d366af46 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -737,7 +737,7 @@ (define (check-synopsis-style package) (define (check-start-with-package-name synopsis) (if (and (regexp-exec (package-name-regexp package) synopsis) - (not (starts-with-abbreviation? synopsis))) + (not (starts-with-abbreviation? synopsis))) (list (make-warning package (G_ "synopsis should not start with the package name") diff --git a/tests/lint.scm b/tests/lint.scm index 95d82d7490..b899ebc700 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -171,14 +171,14 @@ (define (warning-contains? str warnings) "description contains leading whitespace" (single-lint-warning-message (let ((pkg (dummy-package "x" - (description " Whitespace.")))) + (description " Whitespace.")))) (check-description-style pkg)))) (test-equal "description: trailing whitespace" "description contains trailing whitespace" (single-lint-warning-message (let ((pkg (dummy-package "x" - (description "Whitespace. ")))) + (description "Whitespace. ")))) (check-description-style pkg)))) (test-equal "description: pluralized 'This package'" @@ -359,18 +359,18 @@ (define (warning-contains? str warnings) '() (check-compiler-for-target (dummy-package "x" - (arguments - (list #:make-flags - #~(list (string-append "CC=" (cc-for-target)))))))) + (arguments + (list #:make-flags + #~(list (string-append "CC=" (cc-for-target)))))))) (test-equal "compiler-for-target: CC=gcc is acceptable when target=#false" '() (check-compiler-for-target ;; This (dummy) package consists purely of architecture-independent data. (dummy-package "tzdata" - (arguments - (list #:target #false - #:make-flags #~(list "CC=gcc")))))) + (arguments + (list #:target #false + #:make-flags #~(list "CC=gcc")))))) ;; The emacs-build-system sets #:tests? #f by default. (test-equal "tests-true: #:tests? #t acceptable for emacs packages"