Don't lock if we don't have a package root (#7335)

neonichu · web-flow · commit ec4bc27b46b4 · 2024-02-13T12:03:58.000-08:00
It seems like for reasons we have a fallback scratch directory even if
we couldn't determine a package root, but it doesn't seem as if we
should lock that since it is likely not the scratch directory we want.
diff --git a/Sources/CoreCommands/SwiftTool.swift b/Sources/CoreCommands/SwiftTool.swift
@@ -901,6 +901,9 @@ public final class SwiftTool {
     }
 
     fileprivate func acquireLockIfNeeded() throws {
+        guard packageRoot != nil else {
+            return
+        }
         assert(workspaceLockState == .needsLocking, "attempting to `acquireLockIfNeeded()` from unexpected state: \(workspaceLockState)")
         guard workspaceLock == nil else {
             throw InternalError("acquireLockIfNeeded() called multiple times")

Original file line number	Diff line number	Diff line change
`@@ -901,6 +901,9 @@ public final class SwiftTool {`
`901`	`901`	`}`
`902`	`902`
`903`	`903`	`fileprivate func acquireLockIfNeeded() throws {`
	`904`	`+ guard packageRoot != nil else {`
	`905`	`+ return`
	`906`	`+ }`
`904`	`907`	assert(workspaceLockState == .needsLocking, "attempting to `acquireLockIfNeeded()` from unexpected state: \(workspaceLockState)")
`905`	`908`	`guard workspaceLock == nil else {`
`906`	`909`	`throw InternalError("acquireLockIfNeeded() called multiple times")`