Merge pull request #33719 from cachedout/fixup_33653

Catch oserror for race condition
This commit is contained in:
Mike Place 2016-06-03 10:25:26 -07:00
commit 47d668e071

View file

@ -256,7 +256,10 @@ def save_minions(jid, minions, syndic_id=None):
try:
if not os.path.exists(jid_dir):
os.makedirs(jid_dir)
try:
os.makedirs(jid_dir)
except OSError:
pass
serial.dump(minions, salt.utils.fopen(minions_path, 'w+b'))
except IOError as exc:
log.error(