diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-17 23:41:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-18 00:39:50 +0100 |
| commit | 4fd06a4dd1d4a894b96e586cef594270f8bbb88f (patch) | |
| tree | fe9ed8b141d4606e4153e0a476bfb8694b64869d /guix/http-client.scm | |
| parent | 36626c556ed75219bce196ac93d148f6b9af984c (diff) | |
| download | gnu-guix-4fd06a4dd1d4a894b96e586cef594270f8bbb88f.tar gnu-guix-4fd06a4dd1d4a894b96e586cef594270f8bbb88f.tar.gz | |
http-client: Avoid name clash with 'open-connection-for-uri' in 2.2.0.
* guix/build/download.scm (open-connection-for-uri): Add note about
same-named binding in Guile 2.2.0.
* guix/http-client.scm: Use 'guix:open-connection-for-uri' for the
procedure coming from (guix build download).
* guix/scripts/lint.scm: Likewise.
* guix/scripts/substitute.scm: Likewise.
Diffstat (limited to 'guix/http-client.scm')
| -rw-r--r-- | guix/http-client.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/http-client.scm b/guix/http-client.scm index 855ae95a43..6874c51db6 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -38,7 +38,9 @@ #:select (mkdir-p dump-port)) #:use-module ((guix build download) #:select (open-socket-for-uri - open-connection-for-uri resolve-uri-reference)) + (open-connection-for-uri + . guix:open-connection-for-uri) + resolve-uri-reference)) #:re-export (open-socket-for-uri) #:export (&http-get-error http-get-error? @@ -234,9 +236,9 @@ Raise an '&http-get-error' condition if downloading fails." (let loop ((uri (if (string? uri) (string->uri uri) uri))) - (let ((port (or port (open-connection-for-uri uri - #:verify-certificate? - verify-certificate?))) + (let ((port (or port (guix:open-connection-for-uri uri + #:verify-certificate? + verify-certificate?))) (headers (match (uri-userinfo uri) ((? string? str) (cons (cons 'Authorization |