simplified the code by removing repeats

(cherry picked from commit 84380b0ee4029212fc1637c008e07bb9958305c3)
pull/17252/merge
Brian Coca 8 years ago
parent c47d580743
commit 680cade77a

@ -121,31 +121,23 @@ class ActionModule(ActionBase):
if remote_checksum in ('0', '1', '2', '3', '4'): if remote_checksum in ('0', '1', '2', '3', '4'):
# these don't fail because you may want to transfer a log file that # these don't fail because you may want to transfer a log file that
# possibly MAY exist but keep going to fetch other log files # possibly MAY exist but keep going to fetch other log files
result['changed'] = False
result['file'] = source
if remote_checksum == '0': if remote_checksum == '0':
result['msg'] = "unable to calculate the checksum of the remote file" result['msg'] = "unable to calculate the checksum of the remote file"
result['file'] = source
result['changed'] = False
elif remote_checksum == '1': elif remote_checksum == '1':
if fail_on_missing: if fail_on_missing:
result['failed'] = True result['failed'] = True
del result['changed']
result['msg'] = "the remote file does not exist" result['msg'] = "the remote file does not exist"
result['file'] = source
else: else:
result['msg'] = "the remote file does not exist, not transferring, ignored" result['msg'] = "the remote file does not exist, not transferring, ignored"
result['file'] = source
result['changed'] = False
elif remote_checksum == '2': elif remote_checksum == '2':
result['msg'] = "no read permission on remote file, not transferring, ignored" result['msg'] = "no read permission on remote file, not transferring, ignored"
result['file'] = source
result['changed'] = False
elif remote_checksum == '3': elif remote_checksum == '3':
result['msg'] = "remote file is a directory, fetch cannot work on directories" result['msg'] = "remote file is a directory, fetch cannot work on directories"
result['file'] = source
result['changed'] = False
elif remote_checksum == '4': elif remote_checksum == '4':
result['msg'] = "python isn't present on the system. Unable to compute checksum" result['msg'] = "python isn't present on the system. Unable to compute checksum"
result['file'] = source
result['changed'] = False
return result return result
# calculate checksum for the local file # calculate checksum for the local file

Loading…
Cancel
Save