aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-03-19 11:45:04 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-19 13:00:21 +0100
commit661c99a434185d2e96c02d41f45faaa1f3458536 (patch)
tree25849e00da2c0721c02c31753ee07283d44aab52
parent284fe3139459e80a65305c7d19846c501d8bd179 (diff)
downloadguix-661c99a434185d2e96c02d41f45faaa1f3458536.tar
guix-661c99a434185d2e96c02d41f45faaa1f3458536.tar.gz
lint: Report details about FTP errors.
* guix/scripts/lint.scm (probe-uri) <'ftp>: Pass more information about failures alongside 'ftp-response. (validate-uri) <ftp-response>: Handle it, and adjust "not reachable" message accordingly.
-rw-r--r--guix/scripts/lint.scm19
1 files changed, 11 insertions, 8 deletions
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 681e557d2c..c40d76b558 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -268,11 +268,11 @@ response from URI, and additional details, such as the actual HTTP response."
(ftp-size conn (basename (uri-path uri))))
(lambda ()
(ftp-close conn))))
- (values 'ftp-response #t)))
+ (values 'ftp-response '(ok))))
(lambda (key . args)
(case key
- ((or ftp-error)
- (values 'ftp-response #f))
+ ((ftp-error)
+ (values 'ftp-response `(error ,@args)))
((getaddrinfo-error system-error gnutls-error)
(values key args))
(else
@@ -296,11 +296,14 @@ warning for PACKAGE mentionning the FIELD."
(response-reason-phrase argument))
field)))
((ftp-response)
- (when (not argument)
- (emit-warning package
- (format #f
- (_ "URI ~a not reachable")
- (uri->string uri)))))
+ (match argument
+ (('ok) #t)
+ (('error port command code message)
+ (emit-warning package
+ (format #f
+ (_ "URI ~a not reachable: ~a (~s)")
+ (uri->string uri)
+ code (string-trim-both message))))))
((getaddrinfo-error)
(emit-warning package
(format #f