saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add fix from merge forward

Browse source
This commit is contained in:
Colton Myers 2015-07-02 11:39:49 -06:00
parent 52f35f761a
commit 38e243fdfb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/fileclient.py
View file

@ -364,7 +364,7 @@ class Client(object):
localsfilesdest = os.path.join(
self.opts['cachedir'], 'localfiles', path.lstrip('|/'))
filesdest = os.path.join(
self.opts['cachedir'], 'files', saltenv, path.lstrip('|'))
self.opts['cachedir'], 'files', saltenv, path.lstrip('|/'))
if os.path.exists(filesdest):
return salt.utils.url.escape(filesdest) if escaped else filesdest