mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
fixes #18632 (os.path.expanduser does not expand quoted paths)
This commit is contained in:
parent
6530a7911e
commit
331078bfd0
@ -72,10 +72,10 @@ def _rbenv_path(runas=None):
|
||||
if runas in (None, 'root'):
|
||||
path = __salt__['config.option']('rbenv.root') or '/usr/local/rbenv'
|
||||
else:
|
||||
path = _cmd_quote(__salt__['config.option']('rbenv.root')
|
||||
or '~{0}/.rbenv'.format(runas))
|
||||
path = _cmd_quote(os.path.expanduser(__salt__['config.option']('rbenv.root')
|
||||
or '~{0}/.rbenv'.format(runas)))
|
||||
|
||||
return os.path.expanduser(path)
|
||||
return path
|
||||
|
||||
|
||||
def _install_rbenv(path, runas=None):
|
||||
|
Loading…
Reference in New Issue
Block a user