valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #970 from nwjsmith/develop

Browse Source 
Work around Python 2.6 bug involving relative paths from root
This commit is contained in:
Thomas S Hatch 2012-03-20 08:29:52 -07:00
commit 5b159230ac
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/fileclient.py
View File

@ -249,14 +249,13 @@ class Client(object):
else:
return ''
else:
dest = os.path.join(
self.opts['cachedir'],
'extrn_files',
env,
os.path.join(
dest = os.path.normpath(
os.sep.join([
self.opts['cachedir'],
'extrn_files',
env,
url_data.netloc,
os.path.relpath(os.path.relpath(url_data.path, '/'), '..')
))
url_data.path]))
destdir = os.path.dirname(dest)
if not os.path.isdir(destdir):
os.makedirs(destdir)