archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix packing windows paths that span drives

Browse Source 
Reported as T48187
This commit is contained in:
Campbell Barton
2016-07-26 07:09:39 +10:00
parent e6f6bd6da3
commit b8a59e504b
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bam/blend/blendfile_pack.py
View File

@@ -65,7 +65,18 @@ def _relpath_remap(
raise Exception("Internal error 'path_src' -> %r must be absolute" % path_src) raise Exception("Internal error 'path_src' -> %r must be absolute" % path_src)
path_src = os.path.normpath(path_src) path_src = os.path.normpath(path_src)
if os.name != "nt":
path_dst = os.path.relpath(path_src, base_dir_src) path_dst = os.path.relpath(path_src, base_dir_src)
else:
# exception for windows, we need to support mapping between drives
try:
path_dst = os.path.relpath(path_src, base_dir_src)
except ValueError:
# include the absolute path when the file is on a different drive.
path_dst = os.path.relpath(
os.path.join(base_dir_src, b'__' + path_src.replace(b':', b'\\')),
base_dir_src,
)
if blendfile_src_dir_fakeroot is None: if blendfile_src_dir_fakeroot is None:
# /foo/../bar.png --> /foo/__/bar.png # /foo/../bar.png --> /foo/__/bar.png