Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed the salt.modules.npm module to check the npm version correctly on the Windows platform #51813

Merged
merged 3 commits into from
Mar 5, 2019
Merged

Fixed the salt.modules.npm module to check the npm version correctly on the Windows platform #51813

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c277b7
Changed the __virtual__ function in salt.states.npm to look for a fun…
arizvisa Feb 25, 2019
899148a
Revert "Changed the __virtual__ function in salt.states.npm to look f…
arizvisa Feb 25, 2019
d9bc1dc
Attempted fix for the salt.modules.npm module to search for the path …
arizvisa Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions salt/modules/npm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down