summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-05-12 12:02:38 -0500
committerJames Cammarata <jimi@sngx.net>2014-05-21 14:55:01 -0500
commit8cc71a6eece72f23b9cf00de134655443c0f5a31 (patch)
tree1adc5c1ac9067a1f661d81c662bac1f7311317e8
parent35652494717863d4bd49e20df85e8390a5506eee (diff)
downloadansible-8cc71a6eece72f23b9cf00de134655443c0f5a31.tar.gz
Do not base synchronize source on the inventory directory
-rw-r--r--lib/ansible/runner/action_plugins/synchronize.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/runner/action_plugins/synchronize.py b/lib/ansible/runner/action_plugins/synchronize.py
index 42432d4fcb..3d3cb8e300 100644
--- a/lib/ansible/runner/action_plugins/synchronize.py
+++ b/lib/ansible/runner/action_plugins/synchronize.py
@@ -33,10 +33,10 @@ class ActionModule(object):
if '_original_file' in self.inject['vars']:
# roles
path = utils.path_dwim_relative(self.inject['_original_file'], 'files', path, self.runner.basedir)
- elif 'inventory_dir' in self.inject['vars']:
- # non-roles
- abs_dir = os.path.abspath(self.inject['vars']['inventory_dir'])
- path = os.path.join(abs_dir, path)
+ if original_path and original_path[-1] == '/' and path[-1] != '/':
+ # make sure the dwim'd path ends in a trailing "/"
+ # if the original path did
+ path += '/'
return path