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 4

Remove redundant _file_find call to the master

Browse source
This commit is contained in:
vzhestkov 2024-04-30 09:27:46 +02:00 • committed by Daniel Wozniak
parent 47ad7709ef
commit e7f1eba0fc
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/fileclient.py
View file

@ -1180,10 +1180,7 @@ class RemoteClient(Client):
if senv:
saltenv = senv
if not salt.utils.platform.is_windows():
hash_server, stat_server = self.hash_and_stat_file(path, saltenv)
else:
hash_server = self.hash_file(path, saltenv)
hash_server = self.hash_file(path, saltenv)
# Check if file exists on server, before creating files and
# directories
@ -1224,10 +1221,7 @@ class RemoteClient(Client):
)
if dest2check and os.path.isfile(dest2check):
if not salt.utils.platform.is_windows():
hash_local, stat_local = self.hash_and_stat_file(dest2check, saltenv)
else:
hash_local = self.hash_file(dest2check, saltenv)
hash_local = self.hash_file(dest2check, saltenv)
if hash_local == hash_server:
return dest2check