valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove invalid JSON for Mac OS X (#36167)

Browse Source 
* Remove invalid JSON for Mac OS X

* Check for fsevents line and remove
This commit is contained in:
Shane Lee 2016-09-12 11:42:43 -06:00 committed by Nicole Thomas
parent 9ce4abefcd
commit 019ef1c47c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/npm.py
View File

@ -185,6 +185,11 @@ def _extract_json(npm_output):
lines = lines[1:] lines = lines[1:]
while lines and not lines[-1].startswith('}') and not lines[-1].startswith(']'): while lines and not lines[-1].startswith('}') and not lines[-1].startswith(']'):
lines = lines[:-1] lines = lines[:-1]
# Mac OSX with fsevents includes the following line in the return
# when a new module is installed which is invalid JSON:
# [fsevents] Success: "..."
while lines and lines[0].startswith('[fsevents]'):
lines = lines[1:]
try: try:
return json.loads(''.join(lines)) return json.loads(''.join(lines))
except ValueError: except ValueError: