Fix 2 for T46811, wrong paths on .bam_paths_uuid

This commit is contained in:
Eibriel
2015-11-28 11:55:58 -03:00
parent 3ab3dbf033
commit f1e5d1d665

View File

@@ -315,6 +315,7 @@ class bam_session:
blendfile_abs, # str blendfile_abs, # str
blendfile, # bytes blendfile, # bytes
binary_edits, binary_edits,
session_rootdir,
paths_uuid_update=None, paths_uuid_update=None,
): ):
@@ -337,7 +338,8 @@ class bam_session:
# update hash! # update hash!
# we could do later, but the file is fresh in cache, so do now # we could do later, but the file is fresh in cache, so do now
from bam.utils.system import uuid_from_file from bam.utils.system import uuid_from_file
paths_uuid_update[blendfile.decode('utf-8')] = uuid_from_file(blendfile_abs) f_rel = os.path.relpath(blendfile_abs, session_rootdir)
paths_uuid_update[f_rel] = uuid_from_file(blendfile_abs)
del uuid_from_file del uuid_from_file
@staticmethod @staticmethod
@@ -381,6 +383,7 @@ class bam_session:
blendfile_abs, blendfile_abs,
blendfile, blendfile,
binary_edits, binary_edits,
session_rootdir,
paths_uuid_update, paths_uuid_update,
) )
del pickle del pickle