01/02: download: Use URI objects for content-addressed mirrors.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit dab2472c6a24630db7c524cb997d358a33820ffd
Author: Ludovic Courtès <address@hidden>
Date:   Fri May 27 10:29:10 2016 +0200

    download: Use URI objects for content-addressed mirrors.
    
    This fixes a bug whereby 'http-fetch' would be passed a string instead
    of a URI object.
    
    * guix/build/download.scm (url-fetch): Rename 'content-addressed-urls'
    to 'content-addressed-uris', and call 'string->uri'.
---
 guix/build/download.scm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/build/download.scm b/guix/build/download.scm
index 7741726..ef515ef 100644
--- a/guix/build/download.scm
+++ b/guix/build/download.scm
@@ -719,11 +719,11 @@ or #f."
                uri)
        #f)))
 
-  (define content-addressed-urls
+  (define content-addressed-uris
     (append-map (lambda (make-url)
                   (filter-map (match-lambda
                                 ((hash-algo . hash)
-                                 (make-url hash-algo hash)))
+                                 (string->uri (make-url hash-algo hash))))
                               hashes))
                 content-addressed-mirrors))
 
@@ -733,7 +733,7 @@ or #f."
 
   (setvbuf (current-error-port) _IOLBF)
 
-  (let try ((uri (append uri content-addressed-urls)))
+  (let try ((uri (append uri content-addressed-uris)))
     (match uri
       ((uri tail ...)
        (or (fetch uri file)