Fix cache locks with multiple mounts

dashea · dashea · commit 8bc13015bcfb · 2025-01-27T11:07:10.000-05:00
Append to the lock list instead of replacing it.

Signed-off-by: David Shea &lt;dshea@redhat.com&gt;
diff --git a/internal/parse/parse.go b/internal/parse/parse.go
@@ -747,7 +747,7 @@ func getMounts(ctx *types.SystemContext, store storage.Store, mountLabel string,
 			finalMounts[mount.Destination] = mount
 		case TypeCache:
 			mount, intermediateMount, lockedPaths, err := GetCacheMount(tokens, nil, tmpDir)
-			lockedTargets = lockedPaths
+			lockedTargets = append(lockedTargets, lockedPaths...)
 			if err != nil {
 				return nil, nil, nil, nil, nil, err
 			}

Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ func getMounts(ctx *types.SystemContext, store storage.Store, mountLabel string,`
`747`	`747`	`finalMounts[mount.Destination] = mount`
`748`	`748`	`case TypeCache:`
`749`	`749`	`mount, intermediateMount, lockedPaths, err := GetCacheMount(tokens, nil, tmpDir)`
`750`		`- lockedTargets = lockedPaths`
	`750`	`+ lockedTargets = append(lockedTargets, lockedPaths...)`
`751`	`751`	`if err != nil {`
`752`	`752`	`return nil, nil, nil, nil, nil, err`
`753`	`753`	`}`