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

fix npm installed command

Browse Source
This commit is contained in:
Aleksey Zhukov 2014-02-02 03:48:16 +04:00
parent e254cbc764
commit ca2b378ed5
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/modules/npm.py
View File

@ -98,15 +98,18 @@ def install(pkg=None,
lines = npm_output.splitlines()
log.error(lines)
# Strip all lines until JSON output starts
while not lines[0].startswith('{') and not lines[0].startswith('['):
lines = lines[1:]
while lines:
# Strip all lines until JSON output starts
while not lines[0].startswith('{') and not lines[0].startswith('['):
lines = lines[1:]
try:
return json.loads(''.join(lines))
except ValueError:
# Still no JSON!! Return the stdout as a string
return npm_output
try:
return json.loads(''.join(lines))
except ValueError:
lines = lines[1:]
# Still no JSON!! Return the stdout as a string
return npm_output
def uninstall(pkg,

2
salt/states/npm.py
View File

@ -129,7 +129,7 @@ def installed(name,
ret['comment'] = 'Error installing \'{0}\': {1}'.format(name, err)
return ret
if call or isinstance(call, list) or isinstance(call, dict):
if call and (isinstance(call, list) or isinstance(call, dict)):
ret['result'] = True
version = call[0]['version']
pkg_name = call[0]['name']