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

Merge pull request #14882 from thusoy/chunked-hashing

Browse Source 
Use salt.utils.get_hash also in local client
This commit is contained in:
Thomas S Hatch 2014-08-11 11:00:54 -06:00
commit 0abe9a6c02
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/fileclient.py
View File

@ -832,8 +832,8 @@ class LocalClient(Client):
else:
opts_hash_type = self.opts.get('hash_type', 'md5')
hash_type = getattr(hashlib, opts_hash_type)
with salt.utils.fopen(path, 'rb') as ifile:
ret['hsum'] = hash_type(ifile.read()).hexdigest()
ret['hsum'] = salt.utils.get_hash(
path, form=hash_type)
ret['hash_type'] = opts_hash_type
return ret
path = self._find_file(path, saltenv)['path']