From 51621062e965da17e260727630e4685e92c50e32 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Wed, 18 Sep 2019 17:55:00 -0700 Subject: [PATCH] Porting PR #51813 to 2019.2.1 --- salt/modules/npm.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/salt/modules/npm.py b/salt/modules/npm.py index 50e88588841c..aaa3325191b1 100644 --- a/salt/modules/npm.py +++ b/salt/modules/npm.py @@ -49,10 +49,13 @@ def _check_valid_version(): Check the version of npm to ensure this module will work. Currently npm must be at least version 1.2. ''' + + # Locate the full path to npm + npm_path = salt.utils.path.which('npm') + # pylint: disable=no-member - npm_version = _LooseVersion( - salt.modules.cmdmod.run('npm --version', output_loglevel='quiet')) - valid_version = _LooseVersion('1.2') + res = salt.modules.cmdmod.run('{npm} --version'.format(npm=npm_path), output_loglevel='quiet') + npm_version, valid_version = _LooseVersion(res), _LooseVersion('1.2') # pylint: enable=no-member if npm_version < valid_version: raise CommandExecutionError(