kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

import: cran: Use the standard diagnostic procedures.

Browse Source 
* guix/import/cran.scm (bioconductor-packages-list)
(fetch-description): Use 'warning' instead of 'format'.
This commit is contained in:
Ludovic Courtès 2021-10-28 14:54:22 +02:00
parent 3fb19280bb
commit 219cf5093e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
guix/import/cran.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; ;;;
@ -34,6 +34,8 @@
#:use-module (web uri) #:use-module (web uri)
#:use-module (guix memoization) #:use-module (guix memoization)
#:use-module (guix http-client) #:use-module (guix http-client)
#:use-module (guix diagnostics)
#:use-module (guix i18n)
#:use-module (gcrypt hash) #:use-module (gcrypt hash)
#:use-module (guix store) #:use-module (guix store)
#:use-module ((guix serialization) #:select (write-file)) #:use-module ((guix serialization) #:select (write-file))
@ -171,11 +173,11 @@ package definition."
release." release."
(let ((url (string->uri (bioconductor-packages-list-url type)))) (let ((url (string->uri (bioconductor-packages-list-url type))))
(guard (c ((http-get-error? c) (guard (c ((http-get-error? c)
(format (current-error-port) (warning (G_ "failed to retrieve list of packages \
"error: failed to retrieve list of packages from ~s: ~a (~s)~%" from ~a: ~a (~a)~%")
(uri->string (http-get-error-uri c)) (uri->string (http-get-error-uri c))
(http-get-error-code c) (http-get-error-code c)
(http-get-error-reason c)) (http-get-error-reason c))
#f)) #f))
;; Split the big list on empty lines, then turn each chunk into an ;; Split the big list on empty lines, then turn each chunk into an
;; alist of attributes. ;; alist of attributes.
@ -237,12 +239,11 @@ case-sensitive."
((cran) ((cran)
(let ((url (string-append %cran-url name "/DESCRIPTION"))) (let ((url (string-append %cran-url name "/DESCRIPTION")))
(guard (c ((http-get-error? c) (guard (c ((http-get-error? c)
(format (current-error-port) (warning (G_ "failed to retrieve package information \
"error: failed to retrieve package information \ from ~a: ~a (~a)~%")
from ~s: ~a (~s)~%" (uri->string (http-get-error-uri c))
(uri->string (http-get-error-uri c)) (http-get-error-code c)
(http-get-error-code c) (http-get-error-reason c))
(http-get-error-reason c))
#f)) #f))
(let* ((port (http-fetch url)) (let* ((port (http-fetch url))
(result (description->alist (read-string port)))) (result (description->alist (read-string port))))