From 6e57727eeac51c085670eb08dc2065706ef0f680 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 31 Mar 2013 14:14:37 -0700
Subject: better error messages when json or node parsing goes wrong.

---
 lib/leap_cli/config/manager.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/leap_cli/config')

diff --git a/lib/leap_cli/config/manager.rb b/lib/leap_cli/config/manager.rb
index cf4d127..f5282c5 100644
--- a/lib/leap_cli/config/manager.rb
+++ b/lib/leap_cli/config/manager.rb
@@ -199,7 +199,7 @@ module LeapCli
         # parse json
         begin
           hash = JSON.parse(buffer.string, :object_class => Hash, :array_class => Array) || {}
-        rescue SyntaxError => exc
+        rescue SyntaxError, JSON::ParserError => exc
           log 0, :error, 'in file "%s":' % filename
           log 0, exc.to_s, :indent => 1
           return nil
-- 
cgit v1.2.3