rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swh: Handle absolute URLs being returned by the API. 

* guix/swh.scm (swh-url): Don't prepend (%swh-base-url) if a domain is
  already present.

This fixes the "guix lint: warning: while connecting to Software Heritage:
host lookup failure: Name or service not known" error message.
This commit is contained in:
Jakub Kądziołka 2020-02-23 12:06:31 +01:00
parent 5ce67a1c20
commit 6a3911b88f
No known key found for this signature in database
GPG Key ID: E315A75846131564
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/swh.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;;
;;; This file is part of GNU Guix.
;;;
@ -126,9 +127,16 @@
(make-parameter "https://archive.softwareheritage.org"))
(define (swh-url path . rest)
;; URLs returned by the API may be relative or absolute. This has changed
;; without notice before. Handle both cases by detecting whether the path
;; starts with a domain.
(define root
(if (string-prefix? "/" path)
(string-append (%swh-base-url) path)
path))
(define url
(string-append (%swh-base-url) path
(string-join rest "/" 'prefix)))
(string-append root (string-join rest "/" 'prefix)))
;; Ensure there's a trailing slash or we get a redirect.
(if (string-suffix? "/" url)