a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

path_dwim: fix when basedir not set

pull/4420/head
Serge van Ginderachter 2014-01-07 09:48:35 +01:00
parent ea4eb3f8ad
commit 836fb4143c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/runner/action_plugins/debug.py
View File

@ -28,6 +28,7 @@ class ActionModule(object):
def __init__(self, runner): def __init__(self, runner):
self.runner = runner self.runner = runner
self.basedir = runner.basedir
def run(self, conn, tmp, module_name, module_args, inject, complex_args=None, **kwargs): def run(self, conn, tmp, module_name, module_args, inject, complex_args=None, **kwargs):
args = {} args = {}
@ -50,7 +51,7 @@ class ActionModule(object):
else: else:
result = dict(msg=args['msg']) result = dict(msg=args['msg'])
elif 'var' in args: elif 'var' in args:
results = template.template(None, "{{ %s }}" % args['var'], inject) results = template.template(self.basedir, "{{ %s }}" % args['var'], inject)
result[args['var']] = results result[args['var']] = results
# force flag to make debug output module always verbose # force flag to make debug output module always verbose

2
lib/ansible/utils/__init__.py
View File

@ -250,6 +250,8 @@ def path_dwim(basedir, given):
elif given.startswith("~"): elif given.startswith("~"):
return os.path.abspath(os.path.expanduser(given)) return os.path.abspath(os.path.expanduser(given))
else: else:
if basedir is None:
basedir = "."
return os.path.abspath(os.path.join(basedir, given)) return os.path.abspath(os.path.join(basedir, given))
def path_dwim_relative(original, dirname, source, playbook_base, check=True): def path_dwim_relative(original, dirname, source, playbook_base, check=True):