fix(scanner): Catch archiver exceptions

Do not only catch exceptions during download, but also when archiving. Fixes #7366. Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Oct 29, 2023 · d02764f · d02764f
1 parent d9839fb
commit d02764f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/scanner/src/main/kotlin/Scanner.kt b/scanner/src/main/kotlin/Scanner.kt
@@ -20,6 +20,7 @@
 package org.ossreviewtoolkit.scanner
 
 import java.io.File
+import java.io.IOException
 import java.nio.file.StandardCopyOption
 import java.time.Instant
 
@@ -714,20 +715,23 @@ class Scanner(
 
         val duration = measureTime {
             provenancesWithMissingArchives.forEach { (pkg, nestedProvenance) ->
-                runCatching {
-                    downloadRecursively(nestedProvenance)
-                }.onSuccess { dir ->
+                var dir: File? = null
+
+                // runCatching has a bug with smart-cast, see https://youtrack.jetbrains.com/issue/KT-62938.
+                try {
+                    dir = downloadRecursively(nestedProvenance)
                     archiver.archive(dir, nestedProvenance.root)
-                    dir.safeDeleteRecursively(force = true)
-                }.onFailure {
+                } catch (e: IOException) {
                     controller.addIssue(
                         pkg.id,
                         Issue(
                             source = "Downloader",
                             message = "Could not create file archive for " +
-                                "'${pkg.id.toCoordinates()}': ${it.collectMessages()}"
+                                "'${pkg.id.toCoordinates()}': ${e.collectMessages()}"
                         )
                     )
+                } finally {
+                    dir?.safeDeleteRecursively(force = true)
                 }
             }
         }