#Fixes nim-lang#24536 building nimble 0.16.4 fails when running build…

…_all.sh (nim-lang#24537)
metagn · Dec 16, 2024 · 556f217 · 556f217
1 parent d31cce5
commit 556f217
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/build_all.bat b/build_all.bat
@@ -26,4 +26,4 @@ if not exist %nim_csources% (
 )
 bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
 koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
-koch tools --skipUserCfg --skipParentCfg --hints:off
+koch tools --skipUserCfg --hints:off
diff --git a/build_all.sh b/build_all.sh
@@ -13,5 +13,5 @@ nimBuildCsourcesIfNeeded "$@"
 
 echo_run bin/nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
 echo_run ./koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
-echo_run ./koch tools --skipUserCfg --skipParentCfg --hints:off
+echo_run ./koch tools --skipUserCfg --hints:off
 
diff --git a/tools/ci_generate.nim b/tools/ci_generate.nim
@@ -44,7 +44,7 @@ proc genBuildExtras(echoRun, koch, nim: string): string =
   result = fmt"""
 {echoRun}{nim} c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
 {echoRun}{koch} boot -d:release --skipUserCfg --skipParentCfg --hints:off
-{echoRun}{koch} tools --skipUserCfg --skipParentCfg --hints:off
+{echoRun}{koch} tools --skipUserCfg --hints:off
 """
 
 proc genWindowsScript(buildAll: bool): string =

diff --git a/tools/deps.nim b/tools/deps.nim
@@ -46,5 +46,7 @@ proc cloneDependency*(destDirBase: string, url: string, commit = commitHead,
 proc updateSubmodules*(dir: string) =
   let oldDir = getCurrentDir()
   setCurrentDir(dir)
-  exec "git submodule update --init"
-  setCurrentDir(oldDir)
+  try:
+    exec "git submodule update --init"
+  finally:
+    setCurrentDir(oldDir)