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

Fix for packing zipfiles (without a bam project root)

Browse Source
This commit is contained in:
Campbell Barton
2014-12-17 14:46:56 +01:00
parent 7e554bf17c
commit 48f5e7751e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/blendfile_pack.py
View File

@@ -61,7 +61,7 @@ def _relpath_remap(
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
path_dst = path_dst.replace(b'..', b'__') path_dst = path_dst.replace(b'..', b'__')
path_dst_final = os.path.relpath(path_dst, fp_basedir) path_dst = os.path.normpath(path_dst)
else: else:
if b'..' in path_dst: if b'..' in path_dst:
# remap, relative to project root # remap, relative to project root
@@ -75,13 +75,12 @@ def _relpath_remap(
if b'..' in path_dst: if b'..' in path_dst:
# SHOULD NEVER HAPPEN # SHOULD NEVER HAPPEN
path_dst = path_dst.replace(b'..', b'__nonproject__') path_dst = path_dst.replace(b'..', b'__nonproject__')
path_dst = os.path.normpath(path_dst)
path_dst = b'_' + path_dst path_dst = b'_' + path_dst
# _dbg(b"FINAL A: " + path_dst) # _dbg(b"FINAL A: " + path_dst)
path_dst_final = os.path.join(os.path.relpath(base_dir_src, fp_basedir), path_dst) path_dst_final = os.path.join(os.path.relpath(base_dir_src, fp_basedir), path_dst)
path_dst_final = os.path.normpath(path_dst_final) path_dst_final = os.path.normpath(path_dst_final)
# _dbg(b"FINAL B: " + path_dst_final) # _dbg(b"FINAL B: " + path_dst_final)
return path_dst, path_dst_final return path_dst, path_dst_final