| commit | 94b066d35882a6d4366d70638368fed04de7dd34 | [log] [tgz] |
|---|---|---|
| author | Scott Baker <smbaker@gmail.com> | Wed May 27 13:03:26 2015 -0700 |
| committer | Scott Baker <smbaker@gmail.com> | Wed May 27 13:03:26 2015 -0700 |
| tree | ddf3ea369346c2e642a92f1049434d37691b4098 | |
| parent | 75234a499c1ec6fd35512c5f3d05947b2ab9685a [diff] | |
| parent | 680f3c680fe710725984b4487d52369ce01090f5 [diff] |
Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/core/xoslib/methods/hpcview.py b/xos/core/xoslib/methods/hpcview.py index e4b39d7..0645405 100644 --- a/xos/core/xoslib/methods/hpcview.py +++ b/xos/core/xoslib/methods/hpcview.py
@@ -48,7 +48,10 @@ if not d: return "null" - d = json.loads(d) + try: + d = json.loads(d) + except: + return "error decoding json '%s'" % str(d) status = d.get("status", "null") if status!="success":