x/cloud-init
Code Issues Proposed changes

Updated non-json message

Browse Source
This commit is contained in:
Joshua Harlow 2014-01-10 17:38:54 -08:00
parent 5a583aa1df
commit 62013d8788
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudinit/ec2_utils.py
View File

@ -111,8 +111,8 @@ class MetadataMaterializer(object):
# Assume it's json, unless it fails parsing... # Assume it's json, unless it fails parsing...
return json.loads(blob) return json.loads(blob)
except (ValueError, TypeError) as e: except (ValueError, TypeError) as e:
LOG.warn("Field %s looked like json, but it was not: %s", LOG.warn("Field %s looked like a json object, but it was"
field, e) " not: %s", field, e)
if blob.find("\n") != -1: if blob.find("\n") != -1:
return blob.splitlines() return blob.splitlines()
return blob return blob