From 20edbe35253a7bbacb64b7da3220132483e2cb94 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 23 Mar 2017 14:48:15 -0500 Subject: [PATCH] Fix a small bug in subtract_basepath It was causing tracebacks on the website --- tools/export/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/export/__init__.py b/tools/export/__init__.py index be8f9c8f5b..8a302aba94 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -138,7 +138,7 @@ def rewrite_basepath(file_name, resources, export_path, loc): export_path - the final destination of the file after export """ new_f = join(loc, relpath(file_name, resources.file_basepath[file_name])) - resources.file_basepath[join(export_path, new_f)] = export_path + resources.file_basepath[new_f] = export_path return new_f @@ -309,10 +309,10 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None, resources.file_basepath[config_header] = dirname(config_header) if zip_proj: - subtract_basepath(resources, export_path) + subtract_basepath(resources, ".") for loc, res in resource_dict.iteritems(): temp = copy.deepcopy(res) - subtract_basepath(temp, export_path, loc) + subtract_basepath(temp, ".", loc) resources.add(temp) else: for _, res in resource_dict.iteritems():