Merge pull request #8923 from nfelger/devel

Fixing issue with symlinked vaults
This commit is contained in:
James Cammarata 2014-09-08 22:08:49 -05:00
commit dc1f233e8d

View file

@ -1494,7 +1494,7 @@ def _load_vars_from_path(path, results, vault_password=None):
% (path, err2.strerror, ))
# follow symbolic link chains by recursing, so we repeat the same
# permissions checks above and provide useful errors.
return _load_vars_from_path(target, results)
return _load_vars_from_path(target, results, vault_password)
# directory
if stat.S_ISDIR(pathstat.st_mode):