diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
| commit | 84157bb8bf2c610584e0836047da4c710f8eaf76 (patch) | |
| tree | be5d8c7238e32802221db55a3ee83e7f6a58affb /guix/build | |
| parent | fa63939acba69e11df44073a7eb687bd2ba48349 (diff) | |
| parent | 03d0aa8b22223b67ec9bbd363c4d5800efdbaf82 (diff) | |
| download | guix-patches-84157bb8bf2c610584e0836047da4c710f8eaf76.tar guix-patches-84157bb8bf2c610584e0836047da4c710f8eaf76.tar.gz | |
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/download.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/guix/build/download.scm b/guix/build/download.scm index c5dddf83de..e3d5244590 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -241,10 +241,8 @@ and 'guix publish', something like (define* (ftp-fetch uri file #:key timeout) "Fetch data from URI and write it to FILE. Return FILE on success. Bail out if the connection could not be established in less than TIMEOUT seconds." - (let* ((userinfo (string-split (uri-userinfo uri) #\:)) - (conn (match userinfo - (("") - (ftp-open (uri-host uri) #:timeout timeout)) + (let* ((conn (match (and=> (uri-userinfo uri) + (cut string-split <> #\:)) (((? string? user)) (ftp-open (uri-host uri) #:timeout timeout #:username user)) |