luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8223 from eed3si9n/wip/syncfiles 

[2.x] fix: Workaround syncFile issue
This commit is contained in:
eugene yokota 2025-08-21 08:29:55 +02:00 committed by GitHub
parent c4e4a6dbb5 353ee59cdb
commit fb56956fa3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
util-cache/src/main/scala/sbt/util/ActionCacheStore.scala
View File

@ -2,7 +2,14 @@ package sbt.util
import java.io.RandomAccessFile
import java.nio.ByteBuffer
import java.nio.file.{ Files, FileSystemException, Path, Paths, StandardCopyOption }
import java.nio.file.{
Files,
FileSystemException,
NoSuchFileException,
Path,
Paths,
StandardCopyOption
}
import java.util.concurrent.atomic.AtomicBoolean
import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser }
import sjsonnew.shaded.scalajson.ast.unsafe.JValue
@ -293,13 +300,18 @@ class DiskActionCacheStore(base: Path, converter: FileConverter) extends Abstrac
case p if !Files.exists(p) =>
// println(s"- syncFile: $p does not exist")
writeFileAndNotify(p)
case p if Digest.sameDigest(p, d) =>
// println(s"- syncFile: $p has same digest")
p
case p =>
// println(s"- syncFile: $p has different digest")
IO.delete(p.toFile())
writeFileAndNotify(p)
try
if Digest.sameDigest(p, d) then p
else
// println(s"- syncFile: $p has different digest")
IO.delete(p.toFile())
writeFileAndNotify(p)
catch
// in theory, Fies.exists(...) should have caught this,
// but in practice, NoSuchFileException is thrown often
case _: NoSuchFileException =>
writeFileAndNotify(p)
/**
* Emulate virtual side effects.