From patchwork Tue Aug 22 16:52:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53103 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 E96C827BBE9; Tue, 22 Aug 2023 17:56:35 +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 2DB9B27BBE2 for ; Tue, 22 Aug 2023 17:56:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYUfj-0004XW-Bi; Tue, 22 Aug 2023 12:56:03 -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 1qYUfi-0004WD-B0 for guix-patches@gnu.org; Tue, 22 Aug 2023 12:56:02 -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 1qYUfg-0000ug-Kr; Tue, 22 Aug 2023 12:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYUfh-0007j0-I4; Tue, 22 Aug 2023 12:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v4 04/10] 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, 22 Aug 2023 16:56:01 +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.169272331029576 (code B ref 65230); Tue, 22 Aug 2023 16:56:01 +0000 Received: (at 65230) by debbugs.gnu.org; 22 Aug 2023 16:55:10 +0000 Received: from localhost ([127.0.0.1]:60338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYUer-0007gw-Bw for submit@debbugs.gnu.org; Tue, 22 Aug 2023 12:55:09 -0400 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]:48487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYUej-0007ep-VZ for 65230@debbugs.gnu.org; Tue, 22 Aug 2023 12:55:02 -0400 Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-76da4437500so151168485a.1 for <65230@debbugs.gnu.org>; Tue, 22 Aug 2023 09:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692723293; x=1693328093; 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=M4f2WKeBdjlZNo6pGrtWjG+LpoMBDMPli863HNQLcVc=; b=H59Zm/qDxYY7P7s55nGwhf4mapcrj+Lhso93V957syyybXDSMpFxwS/A19HvGyfEg3 8n9vTS3uuQlrZyoK5gKlWgDjwQbNEhMNZyUnIfSz1w6jMFSLBtJeVvAExfqwvEBUHErH 22hwNtqWK0rGRl1RnFq42JNoe3xN/xwtQcBd+A95hLCvVJPLOVjBMbEdKslWv37rIWwk rW924ps6GvkS5bun0njjvvgx7qqAtpXqC+NTlL9IXoJxSXkL8tlxFEFcwsreh+Tm7qYh CSUU5+quCyxO6PFvebDumuy1CimzdJ8hSCY1B8oxZyU/Nudn/LmgDT80ekKIztQpTwy2 rPpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692723293; x=1693328093; 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=M4f2WKeBdjlZNo6pGrtWjG+LpoMBDMPli863HNQLcVc=; b=Z4ZmXE5GK7gVhG8uf6rX1HV0XfxG3Qiv9Ahc8ldPnx7CQN9xQRR8NfoWcJ/prmcqiN n6N6S/etq2RUtSyOTscKD3TmATONyq+nEcH9fZPLIAbj2HKgk8V+EPhbQcrkHq5AxRQ6 2v5is/k0jpNaGl3elTISdHq6BgKJbQds5SJn9WtHA1XGxyjoswCmWitGOpFKKps8rOmk neY6W/aBIjcs4iaPRXK03Iwrqp43zzrVDbVFScPAdl1//TeGMWWGGLkZw+UbGUDD5PFu 5/a9mC43pkuSdItenuf9Yg72MnFcdDVuoHaF/tyhrXXUj77vYb+9KQLicyrfP7zl3J+e +x/w== X-Gm-Message-State: AOJu0YwoZweA7w+f1FlDEvu6CwlI7+CSIW4vsaK+PF5Nfx+bnemoDVnP nUrtoV4eMo27DebcBdgbOT2DM8ZsDao= X-Google-Smtp-Source: AGHT+IFkxwoKzMjoVXWchK1UxP25h18RV59Ncw/c127xIKKY+lBOYvtScYc+AgtiM2dMIBOX1IuJaA== X-Received: by 2002:a05:620a:2410:b0:768:134e:1d41 with SMTP id d16-20020a05620a241000b00768134e1d41mr11248250qkn.7.1692723293257; Tue, 22 Aug 2023 09:54:53 -0700 (PDT) Received: from localhost.localdomain (dsl-158-129.b2b2c.ca. [66.158.158.129]) by smtp.gmail.com with ESMTPSA id p12-20020ae9f30c000000b007678973eaa1sm3336262qkg.127.2023.08.22.09.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 09:54:53 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 22 Aug 2023 12:52:21 -0400 Message-ID: <2ae6538027064b1a67afbb4310c99b56da6ea040.1692723147.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <06b6c57b1af15b6ddca780182fc4a5e5264a67db.1692723147.git.maxim.cournoyer@gmail.com> References: <06b6c57b1af15b6ddca780182fc4a5e5264a67db.1692723147.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 fc9cf50f29..30792db60f 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