valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #36092 from UtahDave/fix_pwd_stacktrace

Browse Source 
don't stacktrace on import pwd on Windows
This commit is contained in:
Mike Place 2016-09-08 22:26:00 +09:00 committed by GitHub
commit 0b35b91caa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/snapper.py
View File

@ -17,7 +17,11 @@ import logging
import os
import time
import difflib
from pwd import getpwuid
try:
from pwd import getpwuid
HAS_PWD = True
except ImportError:
HAS_PWD = False
from salt.exceptions import CommandExecutionError
import salt.utils
@ -82,6 +86,8 @@ def __virtual__():
return False, error_msg.format(snapper_error)
elif not bus:
return False, error_msg.format(system_bus_error)
elif not HAS_PWD:
return False, error_msg.format('pwd module not available')
return 'snapper'