ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 12:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix paths to actually be config file relative (#31533)

Browse source 
* fix paths to actually be config file relative

also allow to unfrack paths for 'not cwd'
only use -i 'localhost,' for adhoc in pull
This commit is contained in:
Brian Coca 2017-10-10 22:17:17 -04:00 • committed by Toshio Kuratomi
commit 3886f80e44
2 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/utils/path.py
View file

@ -27,7 +27,7 @@ from ansible.module_utils._text import to_bytes, to_native, to_text
__all__ = ['unfrackpath', 'makedirs_safe']
def unfrackpath(path, follow=True):
def unfrackpath(path, follow=True, basedir=None):
'''
Returns a path that is free of symlinks (if follow=True), environment variables, relative path traversals and symbols (~)
@ -43,12 +43,20 @@ def unfrackpath(path, follow=True):
'$HOME/../../var/mail' becomes '/var/spool/mail'
'''
if follow:
final_path = os.path.normpath(os.path.realpath(os.path.expanduser(os.path.expandvars(to_bytes(path, errors='surrogate_or_strict')))))
else:
final_path = os.path.normpath(os.path.abspath(os.path.expanduser(os.path.expandvars(to_bytes(path, errors='surrogate_or_strict')))))
if basedir is None:
basedir = os.getcwd()
elif os.path.isfile(basedir):
basedir = os.path.dirname(basedir)
return to_text(final_path, errors='surrogate_or_strict')
final_path = os.path.expanduser(os.path.expandvars(to_bytes(path, errors='surrogate_or_strict')))
if not os.path.isabs(final_path):
final_path = os.path.join(to_bytes(basedir, errors='surrogate_or_strict'), final_path)
if follow:
final_path = os.path.realpath(final_path)
return to_text(os.path.normpath(final_path), errors='surrogate_or_strict')
def makedirs_safe(path, mode=None):