[stable-2.7] Fix logic to not re-download existing files when force=no (#45495) (#45509)

* [stable-2.7] Fix logic to not re-download existing files when force=no (#45495)

* Fix logic to not re-download existing files when force=no. Fixes #45491

* Reduce logic complexity.
(cherry picked from commit 5785de582f)

Co-authored-by: Matt Martz <matt@sivel.net>

* Backport of get_url fix cannot use result

result was only added in 2.8+
This commit is contained in:
Matt Martz 2018-09-12 09:28:54 -05:00 committed by Toshio Kuratomi
parent c8fe1126a1
commit 99171a9c6f
3 changed files with 27 additions and 12 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- get_url - Don't re-download files unnecessarily when force=no (https://github.com/ansible/ansible/issues/45491)

View file

@ -466,18 +466,20 @@ def main():
if not force and checksum != '': if not force and checksum != '':
destination_checksum = module.digest_from_file(dest, algorithm) destination_checksum = module.digest_from_file(dest, algorithm)
if checksum == destination_checksum: if checksum != destination_checksum:
# Not forcing redownload, unless checksum does not match checksum_mismatch = True
# allow file attribute changes
module.params['path'] = dest
file_args = module.load_file_common_arguments(module.params)
file_args['path'] = dest
changed = module.set_fs_attributes_if_different(file_args, False)
if changed:
module.exit_json(msg="file already exists but file attributes changed", dest=dest, url=url, changed=changed)
module.exit_json(msg="file already exists", dest=dest, url=url, changed=changed)
checksum_mismatch = True # Not forcing redownload, unless checksum does not match
if not force and not checksum_mismatch:
# Not forcing redownload, unless checksum does not match
# allow file attribute changes
module.params['path'] = dest
file_args = module.load_file_common_arguments(module.params)
file_args['path'] = dest
changed = module.set_fs_attributes_if_different(file_args, False)
if changed:
module.exit_json(msg="file already exists but file attributes changed", dest=dest, url=url, changed=changed)
module.exit_json(msg="file already exists", dest=dest, url=url, changed=changed)
# If the file already exists, prepare the last modified time for the # If the file already exists, prepare the last modified time for the
# request. # request.

View file

@ -241,7 +241,7 @@
# https://github.com/ansible/ansible/issues/29614 # https://github.com/ansible/ansible/issues/29614
- name: Change mode on an already downloaded file and specify checksum - name: Change mode on an already downloaded file and specify checksum
get_url: get_url:
url: 'https://{{ httpbin_host }}/' url: 'https://{{ httpbin_host }}/get'
dest: '{{ output_dir }}/test' dest: '{{ output_dir }}/test'
checksum: 'sha256:7036ede810fad2b5d2e7547ec703cae8da61edbba43c23f9d7203a0239b765c4.' checksum: 'sha256:7036ede810fad2b5d2e7547ec703cae8da61edbba43c23f9d7203a0239b765c4.'
mode: '0775' mode: '0775'
@ -257,6 +257,17 @@
- result is changed - result is changed
- "stat_result.stat.mode == '0775'" - "stat_result.stat.mode == '0775'"
- name: Get a file that already exists
get_url:
url: 'https://{{ httpbin_host }}/get'
dest: '{{ output_dir }}/test'
register: result
- name: Assert that we didn't re-download unnecessarily
assert:
that:
- result is not changed
# https://github.com/ansible/ansible/issues/27617 # https://github.com/ansible/ansible/issues/27617
- name: set role facts - name: set role facts