mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
resolve merge conflict
This commit is contained in:
parent
15901e8585
commit
5a91873983
1 changed files with 4 additions and 7 deletions
|
@ -99,13 +99,10 @@ def main():
|
||||||
if os.path.exists(dest):
|
if os.path.exists(dest):
|
||||||
if not thirsty:
|
if not thirsty:
|
||||||
module.exit_json(msg="file already exists", src=src, dest=dest, changed=False)
|
module.exit_json(msg="file already exists", src=src, dest=dest, changed=False)
|
||||||
if not os.access(dest, os.W_OK):
|
|
||||||
module.fail_json(msg="Destination %s not writable" % (dest))
|
|
||||||
if not os.access(dest, os.R_OK):
|
|
||||||
module.fail_json(msg="Destination %s not readable" % (dest))
|
|
||||||
if (os.path.isdir(dest)):
|
if (os.path.isdir(dest)):
|
||||||
basename = os.path.basename(src)
|
basename = os.path.basename(src)
|
||||||
dest = os.path.join(dest, basename)
|
dest = os.path.join(dest, basename)
|
||||||
|
if os.access(dest, os.R_OK):
|
||||||
md5sum_dest = module.md5(dest)
|
md5sum_dest = module.md5(dest)
|
||||||
else:
|
else:
|
||||||
if not os.path.exists(os.path.dirname(dest)):
|
if not os.path.exists(os.path.dirname(dest)):
|
||||||
|
|
Loading…
Reference in a new issue