提交 de72087d 作者: Hector Sanjuan

Fix some weird code in core/coreunix/add.go

Code was just weird. I think it looks better now.

License: MIT
Signed-off-by: 's avatarHector Sanjuan <hector@protocol.ai>
上级 67259197
...@@ -201,7 +201,8 @@ func (adder *Adder) Finalize() (ipld.Node, error) { ...@@ -201,7 +201,8 @@ func (adder *Adder) Finalize() (ipld.Node, error) {
return nil, err return nil, err
} }
var root mfs.FSNode var root mfs.FSNode
root = mr.GetDirectory() rootdir := mr.GetDirectory()
root = rootdir
err = root.Flush() err = root.Flush()
if err != nil { if err != nil {
...@@ -210,7 +211,7 @@ func (adder *Adder) Finalize() (ipld.Node, error) { ...@@ -210,7 +211,7 @@ func (adder *Adder) Finalize() (ipld.Node, error) {
var name string var name string
if !adder.Wrap { if !adder.Wrap {
children, err := root.(*mfs.Directory).ListNames(adder.ctx) children, err := rootdir.ListNames(adder.ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
...@@ -219,16 +220,9 @@ func (adder *Adder) Finalize() (ipld.Node, error) { ...@@ -219,16 +220,9 @@ func (adder *Adder) Finalize() (ipld.Node, error) {
return nil, fmt.Errorf("expected at least one child dir, got none") return nil, fmt.Errorf("expected at least one child dir, got none")
} }
// Replace root with the first child
name = children[0] name = children[0]
root, err = rootdir.Child(name)
mr, err := adder.mfsRoot()
if err != nil {
return nil, err
}
dir := mr.GetDirectory()
root, err = dir.Child(name)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论