summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-05-06 12:51:26 -0500
committerJames Cammarata <jimi@sngx.net>2014-05-23 15:17:43 -0500
commit4d0ce5bd419e7701e7593a9a697df538138bf0fa (patch)
tree8368c615c2600b0b8a4bd9d37a483e9ec14d7a1a
parentb01da1b780baaadaf7c22639bb32bcfc84077f01 (diff)
downloadansible-4d0ce5bd419e7701e7593a9a697df538138bf0fa.tar.gz
Make sure dwim'd relative path ends in a "/" if the original does
Fixes #7296
-rw-r--r--lib/ansible/runner/action_plugins/synchronize.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ansible/runner/action_plugins/synchronize.py b/lib/ansible/runner/action_plugins/synchronize.py
index 3d3cb8e300..8a8555a204 100644
--- a/lib/ansible/runner/action_plugins/synchronize.py
+++ b/lib/ansible/runner/action_plugins/synchronize.py
@@ -32,6 +32,7 @@ class ActionModule(object):
if 'vars' in self.inject:
if '_original_file' in self.inject['vars']:
# roles
+ original_path = path
path = utils.path_dwim_relative(self.inject['_original_file'], 'files', path, self.runner.basedir)
if original_path and original_path[-1] == '/' and path[-1] != '/':
# make sure the dwim'd path ends in a trailing "/"