summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2018-05-17 10:54:36 -0700
committerToshio Kuratomi <a.badger@gmail.com>2018-05-17 15:24:56 -0700
commit021f33e063044da16ed3dea243a6bdb00c8fcde6 (patch)
tree3b5098e558f087c648260ae1343d738814e29d93
parent20b9ca6e7c572962c6ee4d9dedc8b303f8590c88 (diff)
downloadansible-021f33e063044da16ed3dea243a6bdb00c8fcde6.tar.gz
original basename minus src
-rw-r--r--lib/ansible/modules/files/file.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ansible/modules/files/file.py b/lib/ansible/modules/files/file.py
index 45d15982b9..a977a45c96 100644
--- a/lib/ansible/modules/files/file.py
+++ b/lib/ansible/modules/files/file.py
@@ -191,11 +191,10 @@ def additional_parameter_handling(params):
if (params['state'] not in ("link", "absent") and os.path.isdir(to_bytes(params['path'], errors='surrogate_or_strict'))):
basename = None
- # _original_basename is used by other modules that depend on file
+ # _original_basename is used by other modules that depend on file to construct a correct
+ # destination path when the destination path was a directory
if params['_original_basename']:
basename = params['_original_basename']
- #elif params['src'] is not None:
- # basename = os.path.basename(params['src'])
if basename:
params['path'] = params['path'] = os.path.join(params['path'], basename)