cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update path_dwim() to return absolute path

Browse source 
If path_dwim() is provided a relative path to a file, it will now return an
absolute path of the playbook directory + the relative file path.
This commit is contained in:
Stephen Fromm 2013-01-02 21:53:00 -08:00
parent b54bb2dfed
commit 2100a35663
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/utils/__init__.py
View file

@ -168,14 +168,17 @@ def prepare_writeable_dir(tree):
exit("Cannot write to path %s" % tree) exit("Cannot write to path %s" % tree)
def path_dwim(basedir, given): def path_dwim(basedir, given):
''' make relative paths work like folks expect ''' '''
make relative paths work like folks expect.
if a relative path is provided, convert it to an absolute path.
'''
if given.startswith("/"): if given.startswith("/"):
return given return given
elif given.startswith("~/"): elif given.startswith("~/"):
return os.path.expanduser(given) return os.path.expanduser(given)
else: else:
return os.path.join(basedir, given) return os.path.abspath(os.path.join(basedir, given))
def json_loads(data): def json_loads(data):
''' parse a JSON string and return a data structure ''' ''' parse a JSON string and return a data structure '''