From a07f9ed84c9fc131dba261c5175aa90b6f3e5331 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 20 Aug 2025 20:03:02 +0900 Subject: container/initsymlink: check path equivalence by value Fixes regression introduced while integrating Absolute. Signed-off-by: Ophestra --- container/initsymlink.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'container/initsymlink.go') diff --git a/container/initsymlink.go b/container/initsymlink.go index ae061694..35805544 100644 --- a/container/initsymlink.go +++ b/container/initsymlink.go @@ -54,8 +54,13 @@ func (l *SymlinkOp) apply(state *setupState) error { return nil } -func (l *SymlinkOp) Is(op Op) bool { vl, ok := op.(*SymlinkOp); return ok && *l == *vl } -func (*SymlinkOp) prefix() string { return "creating" } +func (l *SymlinkOp) Is(op Op) bool { + vl, ok := op.(*SymlinkOp) + return ok && ((l == nil && vl == nil) || + (l.Target != nil && vl.Target != nil && l.Target.Is(vl.Target)) && + l.LinkName == vl.LinkName && l.Dereference == vl.Dereference) +} +func (*SymlinkOp) prefix() string { return "creating" } func (l *SymlinkOp) String() string { return fmt.Sprintf("symlink on %q linkname %q", l.Target, l.LinkName) } -- cgit v1.3.1