~ruther/guix-local: import: elpa: Do not abort when failing to download the archive.

0a2ce1ea0ad2f1269cba3f77a77bb336ba2ef0b3 — Ludovic Courtès 8 years ago 9029781

import: elpa: Do not abort when failing to download the archive.

* guix/import/elpa.scm (elpa-fetch-archive): Use 'http-fetch/cached'
directly instead of 'call-with-downloaded-file'.  This ensures we don't
just abort when networking access is lacking, which is required to allow
'guix refresh -c refresh' to proceed.

patch browse .tar.gz

1 files changed, 5 insertions(+), 2 deletions(-)

M guix/import/elpa.scm

M guix/import/elpa.scm => guix/import/elpa.scm +5 -2

@@ 80,8 80,11 @@ NAMES (strings)."
                     (cut string-append <> "/archive-contents"))))
     (if url
         ;; Use a relatively small TTL for the archive itself.
-        (parameterize ((%http-cache-ttl (* 6 3600)))
-          (call-with-downloaded-file url read))
+        (let* ((port (http-fetch/cached (string->uri url)
+                                        #:ttl (* 6 3600)))
+               (data (read port)))
+          (close-port port)
+          data)
         (leave (G_ "~A: currently not supported~%") repo))))
 
 (define* (call-with-downloaded-file url proc #:optional (error-thunk #f))