diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-31 23:13:09 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-31 23:13:09 +0200 |
| commit | 91a0b9cc0bd60864aac43ca137d66f3aea1f92b3 (patch) | |
| tree | 25d3b9d16fbb59dec0bea5b1a695c7fd21372f08 | |
| parent | 1a706ff5cf12202c80bcaafb77a3cab43bac6f4f (diff) | |
| download | gnu-guix-91a0b9cc0bd60864aac43ca137d66f3aea1f92b3.tar gnu-guix-91a0b9cc0bd60864aac43ca137d66f3aea1f92b3.tar.gz | |
lint: 'validate-uri' really returns #f on failure.
* guix/scripts/lint.scm (validate-uri): Always return #f on failure.
| -rw-r--r-- | guix/scripts/lint.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index cced1bda66..b04e39997e 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -287,20 +287,22 @@ response from URI, and additional details, such as the actual HTTP response." (values 'unknown-protocol #f))))) (define (validate-uri uri package field) - "Return #t if the given URI can be reached, otherwise emit a + "Return #t if the given URI can be reached, otherwise return #f and emit a warning for PACKAGE mentionning the FIELD." (let-values (((status argument) (probe-uri uri))) (case status ((http-response) (or (= 200 (response-code argument)) - (emit-warning package - (format #f - (_ "URI ~a not reachable: ~a (~s)") - (uri->string uri) - (response-code argument) - (response-reason-phrase argument)) - field))) + (begin + (emit-warning package + (format #f + (_ "URI ~a not reachable: ~a (~s)") + (uri->string uri) + (response-code argument) + (response-reason-phrase argument)) + field) + #f))) ((ftp-response) (match argument (('ok) #t) @@ -309,7 +311,8 @@ warning for PACKAGE mentionning the FIELD." (format #f (_ "URI ~a not reachable: ~a (~s)") (uri->string uri) - code (string-trim-both message)))))) + code (string-trim-both message))) + #f))) ((getaddrinfo-error) (emit-warning package (format #f |