From 3a089ac512c004aa57bc0c878c37a3aaace80098 Mon Sep 17 00:00:00 2001 From: HelloZeroNet Date: Sun, 10 Apr 2016 13:25:41 +0200 Subject: [PATCH] Dont add data dir path to merged css file --- src/Debug/DebugMedia.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Debug/DebugMedia.py b/src/Debug/DebugMedia.py index 15e65042..f27c9e3c 100644 --- a/src/Debug/DebugMedia.py +++ b/src/Debug/DebugMedia.py @@ -75,9 +75,9 @@ def merge(merged_path): parts = [] s_total = time.time() for file_path in findfiles(merge_dir, find_ext): - parts.append("\n\n/* ---- %s ---- */\n\n" % file_path) + parts.append("\n\n/* ---- %s ---- */\n\n" % file_path.replace(config.data_dir, "")) if file_path.endswith(".coffee"): # Compile coffee script - if file_path in changed or file_path not in old_parts: # Only recompile if changed or its not compiled before + if file_path in changed or file_path.replace(config.data_dir, "") not in old_parts: # Only recompile if changed or its not compiled before if config.coffeescript_compiler is None: config.coffeescript_compiler = findCoffeescriptCompiler() if not config.coffeescript_compiler: @@ -110,7 +110,7 @@ def merge(merged_path): (file_path, re.escape(error).replace("\n", "\\n").replace(r"\\n", r"\n")) ) else: # Not changed use the old_part - parts.append(old_parts[file_path]) + parts.append(old_parts[file_path.replace(config.data_dir, "")]) else: # Add to parts parts.append(open(file_path).read().decode("utf8"))