Add fix from merge forward

This commit is contained in:
Colton Myers 2015-07-02 11:39:49 -06:00
parent 52f35f761a
commit 38e243fdfb

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