From e375d247f2c15c740359ecbf52631a7f7dc7a4f3 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 17 Oct 2019 15:26:22 -0700 Subject: [PATCH] Strip the tot value. (#375) Opening it and saving it in an editor can add a newline, and we have user reports of this happening for users. Fixes emscripten-core/emscripten#9651 --- emsdk.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/emsdk.py b/emsdk.py index 717ef2e..efc3ee9 100755 --- a/emsdk.py +++ b/emsdk.py @@ -1874,11 +1874,15 @@ def find_latest_releases_sdk(which): return 'sdk-releases-%s-%s-64bit' % (which, find_latest_releases_hash()) +def find_tot(): + return open(tot_path()).read().strip() + + def find_tot_sdk(which): if not os.path.exists(tot_path()): print('Tip-of-tree information was not found, run emsdk update-tags') sys.exit(1) - tot = open(tot_path()).read() + tot = find_tot() if not tot: print('Tip-of-tree build was not found, run emsdk update-tags (however, if there is no recent tip-of-tree build, you may need to wait)') sys.exit(1) @@ -2070,7 +2074,7 @@ def load_releases_tags(): tags = list(info['releases'].values()) # Add the tip-of-tree, if it exists. if os.path.exists(tot_path()): - tot = open(tot_path()).read() + tot = find_tot() if tot: tags.append(tot) return tags