fixes #18632 (os.path.expanduser does not expand quoted paths)

This commit is contained in:
Felix Erkinger 2014-12-02 02:40:05 +01:00
parent 6530a7911e
commit 331078bfd0

View File

@ -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):