Skip to content

Commit

Permalink
Fix first run update command to also load the list of tags it fetches.
Browse files Browse the repository at this point in the history
  • Loading branch information
juj committed Mar 25, 2017
1 parent c41c60c commit 66f063b
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions emsdk
Original file line number Diff line number Diff line change
Expand Up @@ -1812,8 +1812,6 @@ def silentremove(filename):

def main():
global emscripten_config_directory, BUILD_FOR_TESTING, ENABLE_LLVM_ASSERTIONS
load_dot_emscripten()
load_sdk_manifest()

if len(sys.argv) <= 1 or sys.argv[1] == 'help' or sys.argv[1] == '--help':
if len(sys.argv) <= 1:
Expand Down Expand Up @@ -1923,6 +1921,13 @@ def main():
return 1
cmd = sys.argv[1]

# On first run when tag list is not present, populate it to bootstrap.
if (cmd == 'install' or cmd == 'list') and not os.path.isfile(sdk_path('llvm-tags-64bit.txt')):
fetch_emscripten_tags()

load_dot_emscripten()
load_sdk_manifest()

# Process global args
for i in range(2, len(sys.argv)):
if sys.argv[i].startswith('--build='):
Expand All @@ -1943,10 +1948,6 @@ def main():
return 1
sys.argv = [x for x in sys.argv if not len(x) == 0]

# On first run when tag list is not present, populate it to bootstrap.
if (cmd == 'install' or cmd == 'list') and not os.path.isfile(sdk_path('llvm-tags-64bit.txt')):
fetch_emscripten_tags()

# Replace meta-packages with the real package names.
if (cmd == 'update' or cmd == 'install' or cmd == 'activate'):
for i in range(2, len(sys.argv)):
Expand Down

0 comments on commit 66f063b

Please sign in to comment.