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 #25869 from rallytime/bp-25788

Browse source 
Back-port #25788 to 2015.5
This commit is contained in:
Thomas S Hatch 2015-07-30 11:33:33 -06:00
commit f26310ff0b
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/utils/minion.py
View file

@ -24,7 +24,7 @@ def running(opts):
data = _read_proc_file(path, opts)
if data is not None:
ret.append(data)
except IOError:
except (IOError, OSError):
# proc files may be removed at any time during this process by
# the minion process that is executing the JID in question, so
# we must ignore ENOENT during this process