diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-01-07 19:44:56 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-02-22 19:53:44 +0000 |
| commit | e35603affbc6d46c48281ba2576380290c46ef76 (patch) | |
| tree | 822642ef563e152f4b1aff39f445422ba10e3b08 | |
| parent | 653d83e6fc1dfaf6b3acbbaf95e86f32cb44ed10 (diff) | |
| download | guix-e35603affbc6d46c48281ba2576380290c46ef76.tar guix-e35603affbc6d46c48281ba2576380290c46ef76.tar.gz | |
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.
| -rwxr-xr-x | guix/scripts/substitute.scm | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index f01c11b020..cd52ad747e 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -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 ;; narinfos, which provides a much stronger guarantee. (let* ((requests (map (cut narinfo-request url <>) paths)) - (result (call-with-cached-connection uri - (lambda (port) - (if port - (begin - (update-progress!) - (http-multiple-get uri - handle-narinfo-response '() - requests - #:open-connection - open-connection-for-uri/cached - #:verify-certificate? #f - #:port port)) - '())) - open-connection-for-uri/maybe))) + (result (begin + (update-progress!) + (http-multiple-get uri + handle-narinfo-response '() + requests + #:open-connection + open-connection-for-uri/maybe + #:verify-certificate? #f)))) (newline (current-error-port)) result)) ((file #f) |