From 1ebd2c0dba27f1d847b4be0a18a261fb9f064934 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Fri, 8 May 2020 10:25:35 -0700 Subject: [PATCH] Fix for parsing existing config in --embedded mode after #495 Ooops, I guess even the most innocent-seeming change can have unintended consequences. Switching to embedded by default will at least make this path more tested in the future. Fixed #497 --- emsdk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/emsdk.py b/emsdk.py index ce9aaf8106..5f5b4f23c4 100755 --- a/emsdk.py +++ b/emsdk.py @@ -1736,8 +1736,9 @@ def is_active(self): debug_print(str(self) + ' is not active, because key="' + key + '" does not exist in .emscripten') return False - # If running in embedded mode, all paths are stored dynamically relative to the emsdk root, so normalize those first. - dot_emscripten_key = dot_emscripten[key].replace("' + emsdk_path + '", emsdk_path()) + # If running in embedded mode, all paths are stored dynamically relative + # to the emsdk root, so normalize those first. + dot_emscripten_key = dot_emscripten[key].replace("emsdk_path + '", "'" + emsdk_path()) if dot_emscripten_key != value: debug_print(str(self) + ' is not active, because key="' + key + '" has value "' + dot_emscripten_key + '" but should have value "' + value + '"') return False