Move error reporting when git is not found during update-tags (#728)
update-tags is called from two places `update-tags` itself and also
as as part of `update`. Silently ignoring the absence of git should
only happen in the later case. If the user explicitly ask for
update-tags we should hard fail as normal.
diff --git a/emsdk.py b/emsdk.py
index 6676607..82f3309 100644
--- a/emsdk.py
+++ b/emsdk.py
@@ -2113,24 +2113,10 @@
return sorted(arr, cmp=cmp)
-def fetch_emscripten_tags():
- git = GIT(must_succeed=False)
-
- if git:
- print('Fetching emscripten-releases repository...')
- emscripten_releases_tot = get_emscripten_releases_tot()
- open(tot_path(), 'w').write(emscripten_releases_tot)
- else:
- print('Update complete, however skipped fetching the Emscripten tags, since git was not found, which is necessary for update-tags.')
- if WINDOWS:
- print("Please install git by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH.")
- elif MACOS:
- print("Please install git from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools ).")
- elif LINUX:
- print("Pease install git using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git .")
- else:
- print("Please install git.")
- return
+def update_tags():
+ print('Fetching emscripten-releases repository...')
+ emscripten_releases_tot = get_emscripten_releases_tot()
+ open(tot_path(), 'w').write(emscripten_releases_tot)
def is_emsdk_sourced_from_github():
@@ -2144,7 +2130,18 @@
sys.exit(1)
if not download_and_unzip(emsdk_zip_download_url, emsdk_path(), download_even_if_exists=True, clobber=False):
sys.exit(1)
- fetch_emscripten_tags()
+ if not GIT(must_succeed=False):
+ print('Update complete, however skipped update-tags, since git was not found.')
+ if WINDOWS:
+ print("Please install git by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH.")
+ elif MACOS:
+ print("Please install git from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools ).")
+ elif LINUX:
+ print("Pease install git using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git .")
+ else:
+ print("Please install git.")
+ return
+ update_tags()
# Lists all legacy (pre-emscripten-releases) tagged versions directly in the Git
@@ -2987,7 +2984,7 @@
rmfile(sdk_path(EMSDK_SET_ENV))
return 0
elif cmd == 'update-tags':
- fetch_emscripten_tags()
+ update_tags()
return 0
elif cmd == 'activate':
if arg_permanent:
