Add extra try-catch clause + extra logging in LocalRepo

VirtusLab · Aug 19, 2024 · 5c90059 · 5c90059
1 parent 052ed4d
commit 5c90059
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 18 deletions.
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
@@ -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
@@ -8,6 +8,7 @@ import scala.build.tests.util.BloopServer
 import scala.build.{BuildThreads, Directories, LocalRepo}
 import scala.cli.internal.CachedBinary
 import scala.util.{Properties, Random}
+import scala.build.tests.TestLogger
 
 class CachedBinaryTests extends munit.FunSuite {
 
@@ -34,7 +35,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
@@ -13,6 +13,7 @@ import scala.cli.commands.package0.Package
 import scala.cli.internal.CachedBinary
 import scala.cli.packaging.Library
 import scala.util.{Properties, Random}
+import scala.build.tests.TestLogger
 
 class PackageTests extends munit.FunSuite {
 
@@ -24,7 +25,7 @@ class PackageTests extends munit.FunSuite {
 
   val defaultOptions = BuildOptions(
     internal = InternalOptions(
-      localRepository = LocalRepo.localRepo(directories.localRepoDir)
+      localRepository = LocalRepo.localRepo(directories.localRepoDir, TestLogger())
     )
   )