diff mbox series

[bug#56318] import: github: Fix updater.

Message ID 49ed104eb9117af150eea008a2029cfae703c79a.1656574934.git.h.goebel@crazy-compilers.com
State Accepted
Headers show
Series [bug#56318] import: github: Fix updater. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Hartmut Goebel June 30, 2022, 7:42 a.m. UTC 
* 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

Comments

Ludovic Courtès July 8, 2022, 9:44 p.m. UTC | #1 
Hi,

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> * guix/import/github.scm(updated-url): For one one of the
>   cases add missing 'prefix' and set new version.

Could you add an example of a case that is fixed by this change in the
commit log?  (Like “‘guix refresh foo’ would fail to find the new
release of ‘foo’ before this change.”)

Also in the commit log: I’d suggest something like “Use correct URL
scheme” instead of “Fix updater”, for clarity.

Otherwise LGTM (assuming the URL scheme is correct), thanks!

Ludo’.
Hartmut Goebel July 11, 2022, 1:36 p.m. UTC | #2 
Thanks for the review. I amended the commit-message an pushed as 
e8cd9e3d12c8c24b7c81e8787207f21e277da540
diff mbox series

Patch

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 <arunisaac@systemreboot.net>
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;;
 ;;; 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))