diff options
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) } |