admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for parsing existing config in --embedded mode after #495 (#498)

Browse Source 
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
This commit is contained in:
Sam Clegg
2020-05-08 13:45:57 -04:00
committed by GitHub
parent 88ae40037b
commit f5e21de6d6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
emsdk.py
View File

@@ -1738,8 +1738,9 @@ class Tool(object):
debug_print(str(self) + ' is not active, because key="' + key + '" does not exist in .emscripten') debug_print(str(self) + ' is not active, because key="' + key + '" does not exist in .emscripten')
return False return False
# If running in embedded mode, all paths are stored dynamically relative to the emsdk root, so normalize those first. # If running in embedded mode, all paths are stored dynamically relative
dot_emscripten_key = dot_emscripten[key].replace("' + emsdk_path + '", emsdk_path()) # to the emsdk root, so normalize those first.
dot_emscripten_key = dot_emscripten[key].replace("emsdk_path + '", "'" + emsdk_path())
if dot_emscripten_key != value: 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 + '"') debug_print(str(self) + ' is not active, because key="' + key + '" has value "' + dot_emscripten_key + '" but should have value "' + value + '"')
return False return False