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

Prevent failed os.makedirs from leaving modified umask in place

Browse source
This commit is contained in:
Erik Johnson 2018-02-26 19:51:29 -06:00
parent 633e1208e4
commit 82ce546e18
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/client/ssh/ssh_py_shim.py
View file

@ -106,8 +106,10 @@ def need_deployment():
if os.path.exists(OPTIONS.saltdir):
shutil.rmtree(OPTIONS.saltdir)
old_umask = os.umask(0o077)
os.makedirs(OPTIONS.saltdir)
os.umask(old_umask)
try:
os.makedirs(OPTIONS.saltdir)
finally:
os.umask(old_umask)
# Verify perms on saltdir
if not is_windows():
euid = os.geteuid()