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

Squelch error logging when varstack is not installed

Browse source 
This gets rid of spurious errors when varstack isn't installed. Most
people won't use this so these errors are not helpful.
This commit is contained in:
Erik Johnson 2018-09-08 18:15:24 -05:00
parent d4d2b3658f
commit c79a823964
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/tops/varstack.py
View file

@ -49,11 +49,9 @@ from __future__ import absolute_import
import logging
try:
HAS_VARSTACK = False
import varstack
HAS_VARSTACK = True
except ImportError:
pass
varstack = None
# Set up logging
log = logging.getLogger(__name__)
@ -63,10 +61,7 @@ __virtualname__ = 'varstack'
def __virtual__():
if not HAS_VARSTACK:
log.error("Can't find varstack master_top")
return False
return __virtualname__
return (False, 'varstack not installed') if varstack is None else __virtualname__
def top(**kwargs):