me
/
guix
Archived
1
0
Fork 0
Code

substitute: Stop using call-with-cached-connection in fetch-narinfos. 

Instead, just pass open-connection-for-uri/maybe to http-multiple-get. This
code should be functionaly similar to the previous code. The eventual aim of
this is to make the connection caching not mandatory in fetch-narinfos.

* guix/scripts/substitute.scm (fetch-narinfos): Remove use of
call-with-cached-connection.
master
Christopher Baines 2021-01-07 19:44:56 +00:00
parent f50b501a74
commit 7b812f7c84
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
guix/scripts/substitute.scm
View File

@ -412,20 +412,14 @@ port to it, or, if connection failed, print a warning and return #f. Pass
;; on the X.509 PKI. We can do it because we authenticate ;; on the X.509 PKI. We can do it because we authenticate
;; narinfos, which provides a much stronger guarantee. ;; narinfos, which provides a much stronger guarantee.
(let* ((requests (map (cut narinfo-request url <>) paths)) (let* ((requests (map (cut narinfo-request url <>) paths))
(result (call-with-cached-connection uri (result (begin
(lambda (port) (update-progress!)
(if port (http-multiple-get uri
(begin handle-narinfo-response '()
(update-progress!) requests
(http-multiple-get uri #:open-connection
handle-narinfo-response '() open-connection-for-uri/maybe
requests #:verify-certificate? #f))))
#:open-connection
open-connection-for-uri/cached
#:verify-certificate? #f
#:port port))
'()))
open-connection-for-uri/maybe)))
(newline (current-error-port)) (newline (current-error-port))
result)) result))
((file #f) ((file #f)