Merge pull request #475 from nafeger/devel

Better error messaging in utils
This commit is contained in:
Michael DeHaan 2012-06-14 12:15:36 -07:00
commit c0a5d91592

View file

@ -182,7 +182,12 @@ def parse_json(data):
# not JSON, but try "Baby JSON" which allows many of our modules to not # not JSON, but try "Baby JSON" which allows many of our modules to not
# require JSON and makes writing modules in bash much simpler # require JSON and makes writing modules in bash much simpler
results = {} results = {}
try :
tokens = shlex.split(data) tokens = shlex.split(data)
except:
print "failed to parse json: "+ data
raise;
for t in tokens: for t in tokens:
if t.find("=") == -1: if t.find("=") == -1:
raise errors.AnsibleError("failed to parse: %s" % data) raise errors.AnsibleError("failed to parse: %s" % data)