From 48f5e7751e8c6e3d62df6c5170afefe4cb811c9b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Dec 2014 14:46:56 +0100 Subject: [PATCH] Fix for packing zipfiles (without a bam project root) --- modules/blendfile_pack.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/blendfile_pack.py b/modules/blendfile_pack.py index 3d0d2bc..88b9e38 100755 --- a/modules/blendfile_pack.py +++ b/modules/blendfile_pack.py @@ -61,7 +61,7 @@ def _relpath_remap( if blendfile_src_dir_fakeroot is None: # /foo/../bar.png --> /foo/__/bar.png 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: if b'..' in path_dst: # remap, relative to project root @@ -75,13 +75,12 @@ def _relpath_remap( if b'..' in path_dst: # SHOULD NEVER HAPPEN path_dst = path_dst.replace(b'..', b'__nonproject__') - path_dst = os.path.normpath(path_dst) path_dst = b'_' + 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.normpath(path_dst_final) - # _dbg(b"FINAL B: " + path_dst_final) + # _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.normpath(path_dst_final) + # _dbg(b"FINAL B: " + path_dst_final) return path_dst, path_dst_final