[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: import: github: Gracefully handle projects that have disappeared.
From: |
guix-commits |
Subject: |
04/06: import: github: Gracefully handle projects that have disappeared. |
Date: |
Fri, 24 Jul 2020 08:22:14 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit ac928d3e9ebdb660f8104f3e4b890a2353787cdf
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jul 24 12:04:22 2020 +0200
import: github: Gracefully handle projects that have disappeared.
Fixes <https://bugs.gnu.org/42509>.
Reported by Alexandru-Sergiu Marton <brown121407@posteo.ro>.
* guix/import/github.scm (fetch-releases-or-tags): Use 'http-fetch'
instead of 'json-fetch', and guard against 404 errors. Upon 404, emit a
warning and return the empty vector.
---
guix/import/github.scm | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/guix/import/github.scm b/guix/import/github.scm
index 95a792d..888b148 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -26,10 +26,13 @@
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (guix utils)
+ #:use-module (guix i18n)
+ #:use-module (guix diagnostics)
#:use-module ((guix download) #:prefix download:)
#:use-module ((guix git-download) #:prefix download:)
#:use-module (guix import utils)
#:use-module (guix import json)
+ #:use-module (json)
#:use-module (guix packages)
#:use-module (guix upstream)
#:use-module (guix http-client)
@@ -162,12 +165,20 @@ empty list."
`((Authorization . ,(string-append "token " (%github-token))))
'())))
- (match (json-fetch release-url #:headers headers)
- (#()
- ;; We got the empty list, presumably because the user didn't use GitHub's
- ;; "release" mechanism, but hopefully they did use Git tags.
- (json-fetch tag-url #:headers headers))
- (x x)))
+ (guard (c ((and (http-get-error? c)
+ (= 404 (http-get-error-code c)))
+ (warning (G_ "~a is unreachable (~a)~%")
+ release-url (http-get-error-code c))
+ '#())) ;return an empty release set
+ (let* ((port (http-fetch release-url #:headers headers))
+ (result (json->scm port)))
+ (close-port port)
+ (match result
+ (#()
+ ;; We got the empty list, presumably because the user didn't use
GitHub's
+ ;; "release" mechanism, but hopefully they did use Git tags.
+ (json-fetch tag-url #:headers headers))
+ (x x)))))
(define (latest-released-version url package-name)
"Return a string of the newest released version name given a string URL like
- branch master updated (c1f3857 -> 3922208), guix-commits, 2020/07/24
- 02/06: gnu: gcc: Fix libstdc++ misconfiguration., guix-commits, 2020/07/24
- 01/06: gnu: gcc@10: Update to 10.2.0., guix-commits, 2020/07/24
- 03/06: pack: '-R' applies to propagated inputs too., guix-commits, 2020/07/24
- 04/06: import: github: Gracefully handle projects that have disappeared.,
guix-commits <=
- 05/06: gnu: Add libtmcg., guix-commits, 2020/07/24
- 06/06: gnu: Add dkgpg., guix-commits, 2020/07/24