01/11: import: cran: Use the standard diagnostic procedures.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 219cf5093ec847b1cce09eb6a21dc2699f133d3d
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Oct 28 14:54:22 2021 +0200

    import: cran: Use the standard diagnostic procedures.
    
    * guix/import/cran.scm (bioconductor-packages-list)
    (fetch-description): Use 'warning' instead of 'format'.
---
 guix/import/cran.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index f649928..5f5f73c 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; 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 © 2020 Martin Becze <mjbecze@riseup.net>
 ;;;
@@ -34,6 +34,8 @@
   #:use-module (web uri)
   #:use-module (guix memoization)
   #:use-module (guix http-client)
+  #:use-module (guix diagnostics)
+  #:use-module (guix i18n)
   #:use-module (gcrypt hash)
   #:use-module (guix store)
   #:use-module ((guix serialization) #:select (write-file))
@@ -171,11 +173,11 @@ package definition."
 release."
   (let ((url (string->uri (bioconductor-packages-list-url type))))
     (guard (c ((http-get-error? c)
-               (format (current-error-port)
-                       "error: failed to retrieve list of packages from ~s: ~a 
(~s)~%"
-                       (uri->string (http-get-error-uri c))
-                       (http-get-error-code c)
-                       (http-get-error-reason c))
+               (warning (G_ "failed to retrieve list of packages \
+from ~a: ~a (~a)~%")
+                        (uri->string (http-get-error-uri c))
+                        (http-get-error-code c)
+                        (http-get-error-reason c))
                #f))
       ;; Split the big list on empty lines, then turn each chunk into an
       ;; alist of attributes.
@@ -237,12 +239,11 @@ case-sensitive."
     ((cran)
      (let ((url (string-append %cran-url name "/DESCRIPTION")))
        (guard (c ((http-get-error? c)
-                  (format (current-error-port)
-                          "error: failed to retrieve package information \
-from ~s: ~a (~s)~%"
-                          (uri->string (http-get-error-uri c))
-                          (http-get-error-code c)
-                          (http-get-error-reason c))
+                  (warning (G_ "failed to retrieve package information \
+from ~a: ~a (~a)~%")
+                           (uri->string (http-get-error-uri c))
+                           (http-get-error-code c)
+                           (http-get-error-reason c))
                   #f))
          (let* ((port   (http-fetch url))
                 (result (description->alist (read-string port))))