nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-10-27 14:43:19 -07:00
parent 90297811a9
commit 0a2ce1ea0a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/import/elpa.scm
View File

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