[ARVADOS] updated: cb15699af6eb0cad3560280b741a135b9af57a80

git at public.curoverse.com git at public.curoverse.com
Mon Jan 12 13:36:37 EST 2015


Summary of changes:
 sdk/cli/bin/arv | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

       via  cb15699af6eb0cad3560280b741a135b9af57a80 (commit)
      from  9fea1c7774bd256788ee76385c0eab05d4508796 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit cb15699af6eb0cad3560280b741a135b9af57a80
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 12 13:38:45 2015 -0500

    4924: Collapse JSON rescue blocks to reduce duplicate code.

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 8aebc5f..a142dba 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -263,9 +263,7 @@ end
 def check_response result
   begin
     results = JSON.parse result.body
-  rescue JSON::ParserError => e
-    raise "Failed to parse server response:\n" + e.to_s
-  rescue Oj::ParseError => e
+  rescue JSON::ParserError, Oj::ParseError => e
     raise "Failed to parse server response:\n" + e.to_s
   end
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list