Add extra try-catch clause + extra logging in LocalRepo (#3114)

Gedochao · web-flow · commit 44c783e8dbdf · 2024-08-20T07:18:05.000Z
diff --git a/modules/build/src/main/scala/scala/build/LocalRepo.scala b/modules/build/src/main/scala/scala/build/LocalRepo.scala
@@ -56,13 +56,13 @@ object LocalRepo {
 
   def localRepo(
     baseDir: os.Path,
+    logger: Logger,
     loader: ClassLoader = Thread.currentThread().getContextClassLoader
   ): Option[String] = {
     val archiveUrl = loader.getResource(resourcePath)
 
-    if (archiveUrl == null) None
+    if archiveUrl == null then None
     else {
-
       val version =
         using(archiveUrl.openStream()) { is =>
           using(WrappedZipInputStream.create(new BufferedInputStream(is))) { zis =>
@@ -75,10 +75,14 @@ object LocalRepo {
 
       val repoDir = baseDir / version
 
-      if (!os.exists(repoDir))
+      if !os.exists(repoDir) then
         withLock((repoDir / os.up).toNIO, version) {
           val tmpRepoDir = repoDir / os.up / s".$version.tmp"
-          os.remove.all(tmpRepoDir)
+          try os.remove.all(tmpRepoDir)
+          catch {
+            case t: Throwable =>
+              logger.message(s"Error removing $tmpRepoDir: ${t.getMessage}")
+          }
           using(archiveUrl.openStream()) { is =>
             using(WrappedZipInputStream.create(new BufferedInputStream(is))) { zis =>
               extractZip(zis, tmpRepoDir)
diff --git a/modules/build/src/test/scala/scala/build/tests/ActionableDiagnosticTests.scala b/modules/build/src/test/scala/scala/build/tests/ActionableDiagnosticTests.scala
@@ -18,7 +18,7 @@ class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {
   val directories     = Directories.under(extraRepoTmpDir)
   val baseOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir)
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())
     )
   )
   val buildThreads = BuildThreads.create()
diff --git a/modules/build/src/test/scala/scala/build/tests/BspServerTests.scala b/modules/build/src/test/scala/scala/build/tests/BspServerTests.scala
@@ -26,7 +26,7 @@ class BspServerTests extends TestUtil.ScalaCliBuildSuite {
   val directories     = Directories.under(extraRepoTmpDir)
   val baseOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir)
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())
     )
   )
   val buildThreads = BuildThreads.create()
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala
@@ -40,7 +40,7 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
   val buildThreads    = BuildThreads.create()
   val baseOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
@@ -354,7 +354,7 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
   test("User scalac options shadow internal ones") {
     val defaultOptions = BuildOptions(
       internal = InternalOptions(
-        localRepository = LocalRepo.localRepo(directories.localRepoDir)
+        localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())
       )
     )
 
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala
@@ -68,7 +68,7 @@ class BuildProjectTests extends TestUtil.ScalaCliBuildSuite {
   test("workspace for bsp") {
     val options = BuildOptions(
       internal = InternalOptions(localRepository =
-        LocalRepo.localRepo(scala.build.Directories.default().localRepoDir)
+        LocalRepo.localRepo(scala.build.Directories.default().localRepoDir, TestLogger())
       )
     )
     val inputs    = Inputs.empty("project")
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildTests.scala
@@ -50,7 +50,7 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
 
   val baseOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
diff --git a/modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala b/modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala
@@ -39,7 +39,7 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
 
   val baseOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
diff --git a/modules/build/src/test/scala/scala/build/tests/InputsTests.scala b/modules/build/src/test/scala/scala/build/tests/InputsTests.scala
@@ -24,7 +24,7 @@ class InputsTests extends TestUtil.ScalaCliBuildSuite {
   def bloopConfigOpt: Option[BloopRifleConfig] = Some(BloopServer.bloopConfig)
   val buildOptions: BuildOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
diff --git a/modules/build/src/test/scala/scala/build/tests/PackagingUsingDirectiveTests.scala b/modules/build/src/test/scala/scala/build/tests/PackagingUsingDirectiveTests.scala
@@ -16,7 +16,7 @@ class PackagingUsingDirectiveTests extends TestUtil.ScalaCliBuildSuite {
 
   val buildOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
diff --git a/modules/build/src/test/scala/scala/build/tests/ScalaNativeUsingDirectiveTests.scala b/modules/build/src/test/scala/scala/build/tests/ScalaNativeUsingDirectiveTests.scala
@@ -17,7 +17,7 @@ class ScalaNativeUsingDirectiveTests extends TestUtil.ScalaCliBuildSuite {
 
   val buildOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
diff --git a/modules/build/src/test/scala/scala/build/tests/ScriptWrapperTests.scala b/modules/build/src/test/scala/scala/build/tests/ScriptWrapperTests.scala
@@ -73,7 +73,7 @@ class ScriptWrapperTests extends TestUtil.ScalaCliBuildSuite {
 
   val baseOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
diff --git a/modules/build/src/test/scala/scala/build/tests/SourceGeneratorTests.scala b/modules/build/src/test/scala/scala/build/tests/SourceGeneratorTests.scala
@@ -35,7 +35,7 @@ class SourceGeneratorTests extends TestUtil.ScalaCliBuildSuite {
 
   val baseOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir),
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),
       keepDiagnostics = true
     )
   )
diff --git a/modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala b/modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala
@@ -430,7 +430,7 @@ final case class SharedOptions(
       ),
       internal = bo.InternalOptions(
         cache = Some(coursierCache),
-        localRepository = LocalRepo.localRepo(Directories.directories.localRepoDir),
+        localRepository = LocalRepo.localRepo(Directories.directories.localRepoDir, logger),
         verbosity = Some(logging.verbosity),
         strictBloopJsonCheck = strictBloopJsonCheck,
         interactive = Some(() => interactive),
diff --git a/modules/cli/src/test/scala/cli/tests/CachedBinaryTests.scala b/modules/cli/src/test/scala/cli/tests/CachedBinaryTests.scala
@@ -3,8 +3,8 @@ package scala.cli.tests
 import com.eed3si9n.expecty.Expecty.{assert => expect}
 
 import scala.build.options.{BuildOptions, InternalOptions}
-import scala.build.tests.TestInputs
 import scala.build.tests.util.BloopServer
+import scala.build.tests.{TestInputs, TestLogger}
 import scala.build.{BuildThreads, Directories, LocalRepo}
 import scala.cli.internal.CachedBinary
 import scala.util.{Properties, Random}
@@ -34,7 +34,7 @@ class CachedBinaryTests extends munit.FunSuite {
 
   val defaultOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir)
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())
     )
   )
 
diff --git a/modules/cli/src/test/scala/cli/tests/PackageTests.scala b/modules/cli/src/test/scala/cli/tests/PackageTests.scala
@@ -6,8 +6,8 @@ import java.nio.file.FileSystems
 
 import scala.build.Ops.*
 import scala.build.options.{BuildOptions, InternalOptions, PackageType}
-import scala.build.tests.TestInputs
 import scala.build.tests.util.BloopServer
+import scala.build.tests.{TestInputs, TestLogger}
 import scala.build.{BuildThreads, Directories, LocalRepo}
 import scala.cli.commands.package0.Package
 import scala.cli.internal.CachedBinary
@@ -24,7 +24,7 @@ class PackageTests extends munit.FunSuite {
 
   val defaultOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir)
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())
     )
   )
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {`
`18`	`18`	`val directories = Directories.under(extraRepoTmpDir)`
`19`	`19`	`val baseOptions = BuildOptions(`
`20`	`20`	`internal = InternalOptions(`
`21`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir)`
	`21`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())`
`22`	`22`	`)`
`23`	`23`	`)`
`24`	`24`	`val buildThreads = BuildThreads.create()`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class BspServerTests extends TestUtil.ScalaCliBuildSuite {`
`26`	`26`	`val directories = Directories.under(extraRepoTmpDir)`
`27`	`27`	`val baseOptions = BuildOptions(`
`28`	`28`	`internal = InternalOptions(`
`29`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir)`
	`29`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())`
`30`	`30`	`)`
`31`	`31`	`)`
`32`	`32`	`val buildThreads = BuildThreads.create()`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {`
`40`	`40`	`val buildThreads = BuildThreads.create()`
`41`	`41`	`val baseOptions = BuildOptions(`
`42`	`42`	`internal = InternalOptions(`
`43`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir),`
	`43`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),`
`44`	`44`	`keepDiagnostics = true`
`45`	`45`	`)`
`46`	`46`	`)`
`@@ -354,7 +354,7 @@ class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {`
`354`	`354`	`test("User scalac options shadow internal ones") {`
`355`	`355`	`val defaultOptions = BuildOptions(`
`356`	`356`	`internal = InternalOptions(`
`357`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir)`
	`357`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())`
`358`	`358`	`)`
`359`	`359`	`)`
`360`	`360`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class BuildProjectTests extends TestUtil.ScalaCliBuildSuite {`
`68`	`68`	`test("workspace for bsp") {`
`69`	`69`	`val options = BuildOptions(`
`70`	`70`	`internal = InternalOptions(localRepository =`
`71`		`- LocalRepo.localRepo(scala.build.Directories.default().localRepoDir)`
	`71`	`+ LocalRepo.localRepo(scala.build.Directories.default().localRepoDir, TestLogger())`
`72`	`72`	`)`
`73`	`73`	`)`
`74`	`74`	`val inputs = Inputs.empty("project")`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {`
`50`	`50`
`51`	`51`	`val baseOptions = BuildOptions(`
`52`	`52`	`internal = InternalOptions(`
`53`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir),`
	`53`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),`
`54`	`54`	`keepDiagnostics = true`
`55`	`55`	`)`
`56`	`56`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {`
`39`	`39`
`40`	`40`	`val baseOptions = BuildOptions(`
`41`	`41`	`internal = InternalOptions(`
`42`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir),`
	`42`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),`
`43`	`43`	`keepDiagnostics = true`
`44`	`44`	`)`
`45`	`45`	`)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class InputsTests extends TestUtil.ScalaCliBuildSuite {`
`24`	`24`	`def bloopConfigOpt: Option[BloopRifleConfig] = Some(BloopServer.bloopConfig)`
`25`	`25`	`val buildOptions: BuildOptions = BuildOptions(`
`26`	`26`	`internal = InternalOptions(`
`27`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir),`
	`27`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),`
`28`	`28`	`keepDiagnostics = true`
`29`	`29`	`)`
`30`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class PackagingUsingDirectiveTests extends TestUtil.ScalaCliBuildSuite {`
`16`	`16`
`17`	`17`	`val buildOptions = BuildOptions(`
`18`	`18`	`internal = InternalOptions(`
`19`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir),`
	`19`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),`
`20`	`20`	`keepDiagnostics = true`
`21`	`21`	`)`
`22`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class ScalaNativeUsingDirectiveTests extends TestUtil.ScalaCliBuildSuite {`
`17`	`17`
`18`	`18`	`val buildOptions = BuildOptions(`
`19`	`19`	`internal = InternalOptions(`
`20`		`- localRepository = LocalRepo.localRepo(directories.localRepoDir),`
	`20`	`+ localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger()),`
`21`	`21`	`keepDiagnostics = true`
`22`	`22`	`)`
`23`	`23`	`)`