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

Merge pull request #28831 from fcrozat/develop

Browse Source 
Fix deployment when umask is non-standard. Fixes #28830
This commit is contained in:
Colton Myers 2015-11-13 10:19:41 -07:00
commit 38c29fe96f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/client/ssh/ssh_py_shim.py
View File

@ -92,8 +92,10 @@ def get_hash(path, form='sha1', chunk_size=4096):
def unpack_thin(thin_path): def unpack_thin(thin_path):
"""Unpack the Salt thin archive.""" """Unpack the Salt thin archive."""
tfile = tarfile.TarFile.gzopen(thin_path) tfile = tarfile.TarFile.gzopen(thin_path)
old_umask = os.umask(0o077)
tfile.extractall(path=OPTIONS.saltdir) tfile.extractall(path=OPTIONS.saltdir)
tfile.close() tfile.close()
os.umask(old_umask)
os.unlink(thin_path) os.unlink(thin_path)
@ -114,8 +116,10 @@ def unpack_ext(ext_path):
'minion', 'minion',
'extmods') 'extmods')
tfile = tarfile.TarFile.gzopen(ext_path) tfile = tarfile.TarFile.gzopen(ext_path)
old_umask = os.umask(0o077)
tfile.extractall(path=modcache) tfile.extractall(path=modcache)
tfile.close() tfile.close()
os.umask(old_umask)
os.unlink(ext_path) os.unlink(ext_path)
ver_path = os.path.join(modcache, 'ext_version') ver_path = os.path.join(modcache, 'ext_version')
ver_dst = os.path.join(OPTIONS.saltdir, 'ext_version') ver_dst = os.path.join(OPTIONS.saltdir, 'ext_version')