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

Fix #2947

Browse Source
This commit is contained in:
Thomas S Hatch 2013-01-01 21:34:48 -07:00
parent 12e7ee1500
commit 0652304f1c
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/file.py
View File

@ -981,8 +981,7 @@ def get_managed(
if data['result']:
sfn = data['data']
with salt.utils.fopen(sfn, 'r') as source:
hsum = hashlib.md5(source.read()).hexdigest()
hsum = get_hash(sfn)
source_sum = {'hash_type': 'md5',
'hsum': hsum}
else:
@ -1266,10 +1265,7 @@ def manage_file(name,
if os.path.isfile(name):
# Only test the checksums on files with managed contents
if source:
name_sum = ''
hash_func = getattr(hashlib, source_sum['hash_type'])
with salt.utils.fopen(name, 'rb') as namefile:
name_sum = hash_func(namefile.read()).hexdigest()
name_sum = get_hash(name, source_sum['hash_type'])
# Check if file needs to be replaced
if source and source_sum['hsum'] != name_sum:
@ -1341,9 +1337,7 @@ def manage_file(name,
# If the downloaded file came from a non salt server source verify
# that it matches the intended sum value
if urlparse(source).scheme != 'salt':
hash_func = getattr(hashlib, source_sum['hash_type'])
with salt.utils.fopen(sfn, 'rb') as dlfile:
dl_sum = hash_func(dlfile.read()).hexdigest()
dl_sum = get_hash(name, source_sum['hash_type'])
if dl_sum != source_sum['hsum']:
ret['comment'] = ('File sum set for file {0} of {1} does '
'not match real sum of {2}'