From patchwork Tue Aug 15 20:29:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52871 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 B529F27BBE9; Tue, 15 Aug 2023 21:33:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 2FB6327BBE2 for ; Tue, 15 Aug 2023 21:33:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qW0i1-000555-Fi; Tue, 15 Aug 2023 16:32:09 -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 1qW0hz-00054G-Av for guix-patches@gnu.org; Tue, 15 Aug 2023 16:32:07 -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 1qW0hz-0008LT-2i; Tue, 15 Aug 2023 16:32:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qW0hw-0005g8-EW; Tue, 15 Aug 2023 16:32:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v2 07/13] gnu-maintenance: Fix indentation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 15 Aug 2023 20:32:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65230 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65230@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65230-submit@debbugs.gnu.org id=B65230.169213147021656 (code B ref 65230); Tue, 15 Aug 2023 20:32:04 +0000 Received: (at 65230) by debbugs.gnu.org; 15 Aug 2023 20:31:10 +0000 Received: from localhost ([127.0.0.1]:36796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW0h3-0005d8-V2 for submit@debbugs.gnu.org; Tue, 15 Aug 2023 16:31:10 -0400 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:54583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW0h0-0005bA-10 for 65230@debbugs.gnu.org; Tue, 15 Aug 2023 16:31:06 -0400 Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-40fd2f6bd7cso40873421cf.1 for <65230@debbugs.gnu.org>; Tue, 15 Aug 2023 13:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692131460; x=1692736260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NChkL5OrIwj9vZ+wWHvnTwIVDB6osNDrfs6xUqJhXf0=; b=mEtIu7a6rwsniVM0gY9fRlyMkiyYi0CnxkBFDDdCT8kOoARcOup4JQdcjnxjCa3R1S 2GfeceCw5FoOsD4spauM6ODQHwN8+vIP1VyozJSTGKXUd3bicl73mnCTUOX4EX6sPDm9 E27F3vb485E2At+T/drCDeYvALxOqZ87xqWTSgx0B6ZZXCeeDHBX6OeFyp/XZVjvntR0 /c3633hG8EjnfqElVLrIsk+Q5ipa/COiBybdElp6tsBclzySIfsZSiVwtIfrJR+vTg2x LK+51cCiRyVDMy35bHppqdCxkVYjK0ecAIx0B+vMKjfMp+C5qGyINnEEjIiJA8vmhNr2 kLnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692131460; x=1692736260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NChkL5OrIwj9vZ+wWHvnTwIVDB6osNDrfs6xUqJhXf0=; b=BSDdy+q5ztdX4hrPDWyHmUTLOPopK0FkNrS+Oo3ka9lL8qMGyMBCamKbShp6Azi3T+ IBlZcP8xXEvjNKoidIDn95fbLdX/AmXq6C7rrOyXTFp5zmCZLsgyKdroSSUnJ4afs/4A gtbxnDupJE8qBu4m3XZDmItbyyePbDESpJs68Jnbq9/mhCCl5fXohJpXyliwGs5xF6dD WyBNlMPbxDm9eTg3dQnMG2F9nYvcNtOlT0d1fHms6mDaejt+C0OqSuPSnPQJmVSH+oiJ a+wV7MoHby/g1lDOj/hA+ysyIYQspnPOHmRxt6OEsPKn20NzUGh3fqR9v/1pYgbF4t4e EVpg== X-Gm-Message-State: AOJu0YxEcmpf6IN9NwfQRUOfbBPCib7Nq7MSChcWsuDHBlN4H2uWT1UA imlgLu3x1W5wj4FN0Eza3pbsR8PwAh3l9w== X-Google-Smtp-Source: AGHT+IGS8so/tgQjixqP7gKcD0r0ZNK56nRnoT1yIBdkovVPfmKTpKhAbECW+07hCDUfWuW+cJYMuw== X-Received: by 2002:a05:622a:14b:b0:400:9c4e:2abe with SMTP id v11-20020a05622a014b00b004009c4e2abemr21010569qtw.13.1692131460257; Tue, 15 Aug 2023 13:31:00 -0700 (PDT) Received: from localhost.localdomain (dsl-148-65.b2b2c.ca. [66.158.148.65]) by smtp.gmail.com with ESMTPSA id f26-20020ac86eda000000b0040fe13251dasm4021078qtv.83.2023.08.15.13.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 13:31:00 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 15 Aug 2023 16:29:31 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.git.maxim.cournoyer@gmail.com> References: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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/gnu-maintenance.scm: Re-indent file. --- (no changes since v1) guix/gnu-maintenance.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2e0fc3e8ab..67abbc1c5a 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -578,11 +578,11 @@ (define* (import-html-release base-url package (coalesce-sources candidates)) ;; Select the most recent release and return it. (reduce (lambda (r1 r2) - (if (version>? (upstream-source-version r1) - (upstream-source-version r2)) - r1 r2)) - first - (coalesce-sources candidates))))))) + (if (version>? (upstream-source-version r1) + (upstream-source-version r2)) + r1 r2)) + first + (coalesce-sources candidates))))))) ;;; @@ -656,20 +656,20 @@ (define* (import-gnu-release package #:key (version #f)) (tarballs (filter (lambda (file) (string=? version (tarball->version file))) relevant))) - (match tarballs - (() #f) - (_ - (upstream-source - (package name) - (version version) - (urls (map (lambda (file) - (string-append "mirror://gnu/" - (string-drop file - (string-length "/gnu/")))) - ;; Sort so that the tarball with the same compression - ;; format as currently used in PACKAGE comes first. - (sort tarballs better-tarball?))) - (signature-urls (map (cut string-append <> ".sig") urls)))))))) + (match tarballs + (() #f) + (_ + (upstream-source + (package name) + (version version) + (urls (map (lambda (file) + (string-append "mirror://gnu/" + (string-drop file + (string-length "/gnu/")))) + ;; Sort so that the tarball with the same compression + ;; format as currently used in PACKAGE comes first. + (sort tarballs better-tarball?))) + (signature-urls (map (cut string-append <> ".sig") urls)))))))) (define %package-name-rx ;; Regexp for a package name, e.g., "foo-X.Y". Since TeXmacs uses