mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
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.
This commit is contained in:
parent
284fe31394
commit
661c99a434
1 changed files with 11 additions and 8 deletions
|
@ -268,11 +268,11 @@ (define 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 @@ (define (validate-uri uri package 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
|
||||
|
|
Loading…
Reference in a new issue