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

Allow memusage beacon to load on Windows

Browse source 
As long as python-psutil is installed, this should be able to work.

Fixes #38462

See #38462 for more information.
This commit is contained in:
rallytime 2017-01-05 10:05:28 -05:00
parent 14b643fd48
commit 1fe945df5e
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/beacons/memusage.py
View file

@ -12,9 +12,6 @@ from __future__ import absolute_import
import logging
import re
# Import Salt libs
import salt.utils
# Import Third Party Libs
try:
import psutil
@ -28,9 +25,7 @@ __virtualname__ = 'memusage'
def __virtual__():
if salt.utils.is_windows():
return False
elif HAS_PSUTIL is False:
if HAS_PSUTIL is False:
return False
else:
return __virtualname__