paths are now relative to project root when checked out

This commit is contained in:
2014-11-06 14:42:38 +01:00
parent c6e7f2349c
commit 7cb1e806af
3 changed files with 14 additions and 4 deletions

View File

@@ -265,7 +265,7 @@ class FileAPI(Resource):
return jsonify(message='File not allowed')
@staticmethod
def pack_fn(filepath, filepath_zip, base_path, report):
def pack_fn(filepath, filepath_zip, paths_remap_relbase, report):
import os
assert(os.path.exists(filepath) and not os.path.isdir(filepath))
@@ -281,6 +281,7 @@ class FileAPI(Resource):
try:
yield from blendfile_pack.pack(
filepath.encode('utf-8'), filepath_zip.encode('utf-8'), mode='ZIP',
paths_remap_relbase=paths_remap_relbase.encode('utf-8'),
# TODO(cam) this just means the json is written in the zip
deps_remap=deps_remap, paths_remap=paths_remap, paths_uuid=paths_uuid,
report=report)