saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix npm execution module stacktrace

Browse source 
Fixes (part of) #23657.  __salt__ is not loaded for hidden module
functions (functions beginning with '_').
This commit is contained in:
Justin Findlay 2015-05-14 09:50:55 -06:00
parent 13facbf077
commit 05392f282e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/npm.py
View file

@ -28,7 +28,7 @@ def __virtual__():
'''
try:
if salt.utils.which('npm') is not None:
_check_valid_version()
_check_valid_version(__salt__)
return True
else:
return (False, 'npm execution module could not be loaded '
@ -37,14 +37,14 @@ def __virtual__():
return (False, str(exc))
def _check_valid_version():
def _check_valid_version(salt):
'''
Check the version of npm to ensure this module will work. Currently
npm must be at least version 1.2.
'''
# pylint: disable=no-member
npm_version = distutils.version.LooseVersion(
__salt__['cmd.run']('npm --version'))
salt['cmd.run']('npm --version'))
valid_version = distutils.version.LooseVersion('1.2')
# pylint: enable=no-member
if npm_version < valid_version: