diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-13 22:13:11 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-13 22:15:59 +0100 |
| commit | ecdb81e159a29c92351bc51c3556a760074f7473 (patch) | |
| tree | f7113a1036729caab5fef32fd783b7b984b91898 | |
| parent | db32c281dd8c74b938119048d63090e84fb4ebe0 (diff) | |
| download | guix-ecdb81e159a29c92351bc51c3556a760074f7473.tar guix-ecdb81e159a29c92351bc51c3556a760074f7473.tar.gz | |
guix-download: Gracefully handle invalid URIs.
* guix-download.in (guix-download): Error out when `string->uri'
returns #f. Use `leave' when the scheme is unknown.
* tests/guix-download.sh: Add tests.
| -rw-r--r-- | guix-download.in | 11 | ||||
| -rw-r--r-- | tests/guix-download.sh | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/guix-download.in b/guix-download.in index 46efaa17e8..a3fd4b55d4 100644 --- a/guix-download.in +++ b/guix-download.in @@ -159,16 +159,15 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@")) (let* ((opts (parse-options)) (store (open-connection)) - (uri (string->uri (assq-ref opts 'argument))) + (uri (or (string->uri (assq-ref opts 'argument)) + (leave (_ "guix-download: ~a: failed to parse URI~%") + (assq-ref opts 'argument)))) (fetch (case (uri-scheme uri) ((http) http-fetch) ((ftp) ftp-fetch) (else - (begin - (format (current-error-port) - (_ "guix-download: ~a: unsupported URI scheme~%") - (uri-scheme uri)) - (exit 1))))) + (leave (_ "guix-download: ~a: unsupported URI scheme~%") + (uri-scheme uri))))) (path (call-with-temporary-output-file (lambda (name port) (fetch uri port) diff --git a/tests/guix-download.sh b/tests/guix-download.sh index 74ef48ba4b..fc7b35d1b3 100644 --- a/tests/guix-download.sh +++ b/tests/guix-download.sh @@ -25,3 +25,9 @@ guix-download --version # Make sure it fails here. if guix-download http://www.example.com/does-not-exist then false; else true; fi + +if guix-download unknown://some/where; +then false; else true; fi + +if guix-download not/a/uri; +then false; else true; fi |