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

Strip the tot value. (#375)

Browse Source 
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
This commit is contained in:
Alon Zakai
2019-10-17 15:26:22 -07:00
committed by GitHub
parent c56422590b
commit e375d247f2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
emsdk.py
View File

@@ -1874,11 +1874,15 @@ def find_latest_releases_sdk(which):
return 'sdk-releases-%s-%s-64bit' % (which, find_latest_releases_hash()) 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): def find_tot_sdk(which):
if not os.path.exists(tot_path()): if not os.path.exists(tot_path()):
print('Tip-of-tree information was not found, run emsdk update-tags') print('Tip-of-tree information was not found, run emsdk update-tags')
sys.exit(1) sys.exit(1)
tot = open(tot_path()).read() tot = find_tot()
if not 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)') 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) sys.exit(1)
@@ -2070,7 +2074,7 @@ def load_releases_tags():
tags = list(info['releases'].values()) tags = list(info['releases'].values())
# Add the tip-of-tree, if it exists. # Add the tip-of-tree, if it exists.
if os.path.exists(tot_path()): if os.path.exists(tot_path()):
tot = open(tot_path()).read() tot = find_tot()
if tot: if tot:
tags.append(tot) tags.append(tot)
return tags return tags