From patchwork Fri Aug 11 18:44:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52759 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 4621227BBEA; Fri, 11 Aug 2023 19:51:20 +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 4537E27BBEC for ; Fri, 11 Aug 2023 19:51:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUXD7-0003cC-Cc; Fri, 11 Aug 2023 14:50: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 1qUXD6-0003bF-6c for guix-patches@gnu.org; Fri, 11 Aug 2023 14:50:08 -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 1qUXD5-00009F-TK; Fri, 11 Aug 2023 14:50:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUXD4-0007rc-KZ; Fri, 11 Aug 2023 14:50:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH 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: Fri, 11 Aug 2023 18:50:06 +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.169177979130083 (code B ref 65230); Fri, 11 Aug 2023 18:50:06 +0000 Received: (at 65230) by debbugs.gnu.org; 11 Aug 2023 18:49:51 +0000 Received: from localhost ([127.0.0.1]:47990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCp-0007p7-1I for submit@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:51 -0400 Received: from mail-oo1-xc2d.google.com ([2607:f8b0:4864:20::c2d]:48603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCj-0007no-G7 for 65230@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:45 -0400 Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-56c87f89178so1803201eaf.1 for <65230@debbugs.gnu.org>; Fri, 11 Aug 2023 11:49:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691779780; x=1692384580; 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=H38W5XtSqRyP9rCQDBZBsL26tMu9BP0S+XiJPPuR46Q=; b=rHA2Lv/PQ7jPOhcf8xfLaPMVhOuVMYZ7m2LGJo+AoYi51Us83Tth3HGOMnkZJCE+yF rfdTIVPlTUwXLleIRj892jNnCxMd+LqJ+Z4naenNqH7E4qxsYRK9oUhT8NgJzr2PxdvB usZLFw0IHyVhWnEeJFp2s2HjUHV3W9MLEdPlZCkbPV5dygZtKeziD3ofA38iHf5zJqRx Is/bU/HAfnSn8UTaDHcDkgA830DkNiQfQdk3BQyp8xkPu34VnzIu2XopV4ZUkTvrcbyo uC4ScgMBAcFEQW0WCJB8IG1jLWuMYCUdaXoajDPoBzp1m7Hlb3RedZ7JgXro60Hzb6ab kXjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691779780; x=1692384580; 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=H38W5XtSqRyP9rCQDBZBsL26tMu9BP0S+XiJPPuR46Q=; b=dNMXUyWcjuG8MBsv99FE0uorUX75bnW1cF+zLvaJFAT87CIrySFA0Xt36NXWMOSrGw 2YVqILJTdsA2qlwwx3+E82uC5r7sKW/SgN6ksHE06UNiRsc0EIdRyGCyX3yLukP0kpYr 13DruV2CkYxwsLlSG2Q4Fh/+vUL8hyGQyC+mbdNkRCKc6mfS6TPy46KN8QWjsnIvA2fQ ChtC+xOeFImSdAGsSmz+Bl1bnMgHetrNK4+05r0VUzcIHvZ8jfjDFHH8YjClRtsfGSmK A1C0lu2DVMXExVE+tpsXlhvwPhirQNJZn3eOEsLLG1OJ0IsfBRLvv45ioJOoga7EgroZ Qkcg== X-Gm-Message-State: AOJu0YwGOR4t3LnVtKSm0uOREba2hBPezrLoZvnmY7a4829JWT0Uodpr hYoFmvBMZXNkQQMPBX/Ss+k2hL5DgWU53w== X-Google-Smtp-Source: AGHT+IEcnbNIqRXXhg3KbKqOU4SSwY4IXaa6+t+YuE8brVoCroiC+LflmgCDY1S7rEGh6gCcyaNn1w== X-Received: by 2002:a05:6358:908:b0:135:48d9:eb90 with SMTP id r8-20020a056358090800b0013548d9eb90mr3279692rwi.13.1691779779616; Fri, 11 Aug 2023 11:49:39 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-92.b2b2c.ca. [205.236.230.92]) by smtp.gmail.com with ESMTPSA id e29-20020ac8011d000000b00405553305casm1366398qtg.86.2023.08.11.11.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 11:49:39 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 11 Aug 2023 14:44:54 -0400 Message-ID: <31253e9ab7c25b82b2a625a14fcfe22c4af9eb28.1691779500.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4f0ffa940ca39719ffa9719a9593190620855769.1691779500.git.maxim.cournoyer@gmail.com> References: <4f0ffa940ca39719ffa9719a9593190620855769.1691779500.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. --- 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