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

Just get a hash for the source archive

Browse source 
file.get_source_sum doesn't actually return a hash, it just
disambiguates a passed hash from a hash extracted from a hash file.
This commit is contained in:
Erik Johnson 2017-04-06 08:58:56 -05:00
parent 9da4eb18bf
commit a717881f53
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
salt/states/archive.py
View file

@ -864,30 +864,25 @@ def extracted(name,
salt.utils.rm_rf(cached_source)
if source_is_local:
# No need to download archive, it's local to the minion
update_source = False
else:
if not os.path.isfile(cached_source):
# Archive not cached, we need to download it
update_source = True
else:
try:
source_sum = __salt__['file.get_source_sum']('',
source_match,
source_hash,
source_hash_name,
__env__)
except CommandExecutionError as exc:
ret['comment'] = exc.strerror
return ret
# Archive is cached, keep=True likely used in prior run
if not source_hash:
# Since no source_hash was passed, we won't update the cached
# copy of the archive.
update_source = False
else:
if 'hsum' not in source_hash:
log.warning('checksum not in file.get_source_sum results')
update_source = True
else:
# We already extracted the hash, set source_hash to the
# extracted result to prevent repeating this work below.
source_hash = source_sum['hsum']
update_source = \
not _compare_checksum(cached_source, source_sum)
# Get the hash of the cached archive
cached_source_sum = __salt__['file.get_hash'](
cached_source,
form=__opts__['hash_type'])
update_source = \
not _compare_checksum(cached_source, cached_source_sum)
if update_source:
if __opts__['test']:
@ -897,6 +892,7 @@ def extracted(name,
'discover if extraction is necessary'.format(source_match)
)
return ret
file_result = __states__['file.managed'](cached_source,
source=source_match,
source_hash=source_hash,
@ -927,11 +923,11 @@ def extracted(name,
if source_hash:
try:
source_sum = __salt__['file.get_source_sum']('',
source_match,
source_hash,
source_hash_name,
__env__)
source_sum = __salt__['file.get_source_sum'](
source=source_match,
source_hash=source_hash,
source_hash_name=source_hash_name,
saltenv=__env__)
except CommandExecutionError as exc:
ret['comment'] = exc.strerror
return ret