From patchwork Thu Jun 30 07:42:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 40422 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 5AFA727BBEA; Thu, 30 Jun 2022 08:44:24 +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.9 required=5.0 tests=BAYES_00,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 2957A27BBE9 for ; Thu, 30 Jun 2022 08:44:24 +0100 (BST) Received: from localhost ([::1]:55430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6oqd-0003Pp-7R for patchwork@mira.cbaines.net; Thu, 30 Jun 2022 03:44:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6opL-0001hS-1M for guix-patches@gnu.org; Thu, 30 Jun 2022 03:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o6opK-0001ZV-Pv for guix-patches@gnu.org; Thu, 30 Jun 2022 03:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o6opK-0006r4-J3 for guix-patches@gnu.org; Thu, 30 Jun 2022 03:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56318] [PATCH] import: github: Fix updater. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Jun 2022 07:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56318 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56318@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165657495526309 (code B ref -1); Thu, 30 Jun 2022 07:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Jun 2022 07:42:35 +0000 Received: from localhost ([127.0.0.1]:60874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6oos-0006qF-UJ for submit@debbugs.gnu.org; Thu, 30 Jun 2022 03:42:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:58692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6ooo-0006q4-HW for submit@debbugs.gnu.org; Thu, 30 Jun 2022 03:42:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6ooo-0000VG-6S for guix-patches@gnu.org; Thu, 30 Jun 2022 03:42:30 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:38881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6oom-0001VS-9f for guix-patches@gnu.org; Thu, 30 Jun 2022 03:42:29 -0400 Received: from hermia.goebel-consult.de ([79.211.185.211]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MTR6K-1oCIRQ14MG-00Tom7 for ; Thu, 30 Jun 2022 09:42:24 +0200 Received: from lenashee.fritz.box (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id EF3385F535; Thu, 30 Jun 2022 09:42:23 +0200 (CEST) From: Hartmut Goebel Date: Thu, 30 Jun 2022 09:42:21 +0200 Message-Id: <49ed104eb9117af150eea008a2029cfae703c79a.1656574934.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.4 MIME-Version: 1.0 X-Provags-ID: V03:K1:beGlotxOzJV+CxVqfCJfal2htpB8+B/8/S5b5Ic4QPOnWXoD6wR aNfMlZ5OdF+TtVu4l2NOO3NBZquvBIk/3aEUU/1kP37tqwnNanJEfLt8PVZVYtNKo6+5otQ 2B6VcwTQMXzGf1cg56Q5XyO13qkns6QVhX5BJRcMfzi8Hlor0Zh3lBby24TiCngmKnNoMyu /89mjAUcsQwRqNf8flPlA== X-UI-Out-Filterresults: notjunk:1;V03:K0:fOygmNoWT9w=:ua7s7vwPq86AASXjeb0btj sV2OOuw4m3PtGS8l8lqqQfoVXL3OgmLGLE76Exq6VtihQdBVTg+KAssjeD6HYSsj2FldeVPMw AWhZ/vc5k39+w26EYjqGEU/p4gfjvAwbiNUUGU8Db8LvR2SAUEdHEDSz0YVrHdVAjO3K7Hm3H zFWgXnQI29qe+y63g9495jV0odPX6dQr2PRuJWeFnjzbWwGG0VFyoe4aD1WWQvfm3oOYKI8gs lHB+ILZ8L6KF+KWupCz2vPgI/1P/9L19eECWljZEWIJ7pt2961VEwElPd60k9cMgtf0OIUgw8 mnMTYLHuv0t3iK88zngA7l5WdyE0Tr5BW8hPHiPL+8+L9tWenEKNcZ+rlMDTJ1LHR0Tk27GUO znviX9B+lGC4VcUhObVeXCnJ9u/SlJRzizruZhRDjRNze0oiKJvpn4gtmfV9IBrP+jD5V+K5f 2eugk61ztzQfWgBr+7TQ1ogxk/GTs6SkTbABmFMEqQlPONvxJKl0oINYfdhtpLjHA/PrhHqTi Goyys6F4nyik/kJqlP6vBlSKBTqMy/1WfXBPeK05cLu3kRZn1UcKYZeN5w5WguWesjyMau4wK Tr5vL9rmyMAeHlFq/UxIYRbcegnzchSWvlogwqjnaZEe/AztTQ2zbl9Kno/RMHffAEOGEYTki mNLqEc2vcd21CSDhZWWqOagMQU3yjQafkW3RC/oOh7K52ephlIJC2uR2Xfbrnea2v/3yvQgs0 3evem7/z77gSt2Jv1RfzFMlsC79AXcZVem/1nAcy2WVC+PYL3tKgutwemfY= Received-SPF: none client-ip=212.227.126.135; envelope-from=h.goebel@crazy-compilers.com; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * guix/import/github.scm(updated-url): For one one of the cases add missing 'prefix' and set new version. --- guix/import/github.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: d7449142f56cb0b34860f4ac90fc322aee32d177 diff --git a/guix/import/github.scm b/guix/import/github.scm index 51118d1d39..e1a1af7133 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,8 +96,8 @@ false if none is recognized" ((string-suffix? (string-append "/releases/download/" repo "-" version "/" repo "-" version ext) url) - (string-append "/releases/download/" repo "-" version "/" repo "-" - version ext)) + (string-append prefix "/releases/download/" repo "-" new-version "/" + repo "-" new-version ext)) (#t #f))) ; Some URLs are not recognised. #f))