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

don't blow up check_perms if lsattr file doesn't exist

Browse source
This commit is contained in:
Daniel Wallace 2018-08-20 09:13:36 -05:00
parent aaa9e37215
commit ab918ca6b0
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/file.py
View file

@ -4459,7 +4459,10 @@ def check_perms(name, ret, user, group, mode, attrs=None, follow_symlinks=False)
is_dir = os.path.isdir(name)
is_link = os.path.islink(name)
if not salt.utils.platform.is_windows() and not is_dir and not is_link:
lattrs = lsattr(name)
try:
lattrs = lsattr(name)
except SaltInvocationError:
lsattrs = None
if lattrs is not None:
# List attributes on file
perms['lattrs'] = ''.join(lattrs.get(name, ''))