diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-08-20 02:32:22 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-08-20 02:32:22 +0900 |
| commit | 66f52407d3a7f59fd7e2743fe1ccee7ad46df795 (patch) | |
| tree | be54701d1394f661e31e237395351cd95d86780a /container/initmkdir.go | |
| parent | e463faf6499fa537f6048857e10d123554112af6 (diff) | |
container/initmkdir: check path equivalence by value
Fixes regression introduced while integrating Absolute.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'container/initmkdir.go')
| -rw-r--r-- | container/initmkdir.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/container/initmkdir.go b/container/initmkdir.go index 75256b27..3043df9f 100644 --- a/container/initmkdir.go +++ b/container/initmkdir.go @@ -29,6 +29,12 @@ func (m *MkdirOp) apply(*setupState) error { return wrapErrSelf(os.MkdirAll(toSysroot(m.Path.String()), m.Perm)) } -func (m *MkdirOp) Is(op Op) bool { vm, ok := op.(*MkdirOp); return ok && m == vm } +func (m *MkdirOp) Is(op Op) bool { + vm, ok := op.(*MkdirOp) + return ok && ((m == nil && vm == nil) || (m != nil && vm != nil && + m.Path != nil && vm.Path != nil && + m.Path.String() == vm.Path.String() && + m.Perm == vm.Perm)) +} func (*MkdirOp) prefix() string { return "creating" } func (m *MkdirOp) String() string { return fmt.Sprintf("directory %q perm %s", m.Path, m.Perm) } |
