* [PATCH] lint: handle FTP URIs.
@ 2015-01-28 18:51 Cyril Roelandt
2015-02-01 20:44 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Cyril Roelandt @ 2015-01-28 18:51 UTC (permalink / raw)
To: guix-devel
* guix/scripts/lint.scm (probe-uri): handle FTP URIs.
---
guix/scripts/lint.scm | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 9d5c689..1e8f0ad 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -21,6 +21,7 @@
(define-module (guix scripts lint)
#:use-module (guix base32)
#:use-module (guix download)
+ #:use-module (guix ftp-client)
#:use-module (guix packages)
#:use-module (guix records)
#:use-module (guix ui)
@@ -254,8 +255,29 @@ response from URI, and additional details, such as the actual HTTP response."
(values key args))
(else
(apply throw key args))))))
+ ('ftp
+ (catch #t
+ (lambda ()
+ (let ((port (ftp-open (uri-host uri) 21)))
+ (define response
+ (dynamic-wind
+ (const #f)
+ (lambda ()
+ (ftp-chdir port (dirname (uri-path uri)))
+ (ftp-size port (basename (uri-path uri))))
+ (lambda ()
+ (ftp-close port))))
+ (values 'ftp-response #t)))
+ (lambda (key . args)
+ (case key
+ ((or ftp-error)
+ (values 'ftp-response #f))
+ ((getaddrinfo-error system-error gnutls-error)
+ (values key args))
+ (else
+ (apply throw key args))))))
(_
- (values 'not-http #f)))))
+ (values 'unknown-protocol #f)))))
(define (validate-uri uri package field)
"Return #t if the given URI can be reached, otherwise emit a
@@ -272,6 +294,12 @@ warning for PACKAGE mentionning the FIELD."
(response-code argument)
(response-reason-phrase argument))
field)))
+ ((ftp-response)
+ (when (not argument)
+ (emit-warning package
+ (format #f
+ (_ "URI ~a not reachable")
+ (uri->string uri)))))
((getaddrinfo-error)
(emit-warning package
(format #f
@@ -293,7 +321,7 @@ warning for PACKAGE mentionning the FIELD."
((invalid-http-response gnutls-error)
;; Probably a misbehaving server; ignore.
#f)
- ((not-http) ;nothing we can do
+ ((unknown-protocol) ;nothing we can do
#f)
(else
(error "internal linter error" status)))))
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] lint: handle FTP URIs.
2015-01-28 18:51 [PATCH] lint: handle FTP URIs Cyril Roelandt
@ 2015-02-01 20:44 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2015-02-01 20:44 UTC (permalink / raw)
To: Cyril Roelandt; +Cc: guix-devel
Cyril Roelandt <tipecaml@gmail.com> skribis:
> * guix/scripts/lint.scm (probe-uri): handle FTP URIs.
[...]
> + (let ((port (ftp-open (uri-host uri) 21)))
> + (define response
Please indent opening bracket below the ‘e.’
LGTM, thank you!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-01 23:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-28 18:51 [PATCH] lint: handle FTP URIs Cyril Roelandt
2015-02-01 20:44 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.