From c2cf679c6f7195ad1845acb39c04bfe092a94f66 Mon Sep 17 00:00:00 2001 From: ZyX Date: Wed, 27 Feb 2013 00:20:48 +0400 Subject: [PATCH] Do not throw away python stack trace Errors when loading powerline fails are almost never giving any useful information for debugging. --- powerline/bindings/vim/plugin/powerline.vim | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/powerline/bindings/vim/plugin/powerline.vim b/powerline/bindings/vim/plugin/powerline.vim index 947db8b4..9ce6b484 100644 --- a/powerline/bindings/vim/plugin/powerline.vim +++ b/powerline/bindings/vim/plugin/powerline.vim @@ -10,7 +10,7 @@ function! s:CriticalError(message) endfunction if ! has('python') && ! has('python3') - call s:CriticalError('You need vim compiled with Python 2.7 or 3.3+ support + call s:CriticalError('You need vim compiled with Python 2.7 or 3.2+ support \ for Powerline to work. Please consult the documentation for more details.') finish endif @@ -28,12 +28,15 @@ catch exec s:powerline_pycmd 'sys.path.append(vim.eval(''expand(":h:h:h:h:h")''))' try exec s:powerline_pycmd s:import_cmd - catch - call s:CriticalError('An error occured while importing the Powerline package. - \ This could be caused by an invalid sys.path setting, or by an incompatible - \ Python version (Powerline requires Python 2.7 or 3.3+ to work). Please consult - \ the troubleshooting section in the documentation for possible solutions.') - finish + let s:launched = 1 + finally + if !exists('s:launched') + call s:CriticalError('An error occured while importing the Powerline package. + \ This could be caused by an invalid sys.path setting, or by an incompatible + \ Python version (Powerline requires Python 2.7 or 3.2+ to work). Please consult + \ the troubleshooting section in the documentation for possible solutions.') + finish + endif endtry endtry exec s:powerline_pycmd 'powerline = VimPowerline()'