Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant _file_find call to the master #645

Merged
merged 1 commit into from
May 15, 2024
Merged

Remove redundant _file_find call to the master #645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions salt/fileclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,10 +1162,7 @@ def get_file(
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
Expand Down Expand Up @@ -1206,10 +1203,7 @@ def get_file(
)

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
Expand Down
Loading