From 35988b93e15a2b852d5a2dec91e992a5af37de7d Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 8 Jan 2017 16:46:15 +0100 Subject: healthcheck: s:download: do not report curl errors (twice) Since `curl -s` is used, the actual error (e.g. "curl: (6) Could not resolve host: pypi.python.org") gets not reported anyway, and s:download returns an error message with `s:shell_error` already. This changes `s:download` to also include `a:url` in the error message now. It removes > ERROR: Command error (7) curl -sL https://pypi.python.org/pypi/neovim/json: And changes > ERROR: HTTP request failed: error: curl error with https://pypi.python.org/pypi/neovim/json: 6 --- runtime/autoload/health/provider.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 58098b08f9..417426c101 100644 --- a/runtime/autoload/health/provider.vim +++ b/runtime/autoload/health/provider.vim @@ -84,8 +84,8 @@ endfunction " Fetch the contents of a URL. function! s:download(url) abort if executable('curl') - let rv = s:system(['curl', '-sL', a:url]) - return s:shell_error ? 'curl error: '.s:shell_error : rv + let rv = s:system(['curl', '-sL', a:url], '', 1, 1) + return s:shell_error ? 'curl error with '.a:url.': '.s:shell_error : rv elseif executable('python') let script = " \try:\n -- cgit