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

Merge pull request #28699 from rallytime/bp-28670

Browse source 
Back-port #28670 to 2015.5
This commit is contained in:
Mike Place 2015-11-09 11:10:58 -07:00
commit 604a7b4199
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/ps.py
View file

@ -97,7 +97,7 @@ def _get_proc_username(proc):
'''
try:
return proc.username() if PSUTIL2 else proc.username
except (psutil.NoSuchProcess, psutil.AccessDenied):
except (psutil.NoSuchProcess, psutil.AccessDenied, KeyError):
return None