opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 02:30:39 +08:00
Code Issues Projects Releases Wiki Activity

block rm: use Marshalers instead of PostRun to process output

Browse Source 
License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
This commit is contained in:
Kevin Atkinson
2017-02-19 21:02:39 -05:00
parent 584c095647
commit 4115e2315d
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/commands/block.go
View File

@ -280,21 +280,19 @@ It takes a list of base58 encoded multihashs to remove.
} }
res.SetOutput(ch) res.SetOutput(ch)
}, },
PostRun: func(req cmds.Request, res cmds.Response) { Marshalers: cmds.MarshalerMap{
if res.Error() != nil { cmds.Text: func(res cmds.Response) (io.Reader, error) {
return outChan, ok := res.Output().(<-chan interface{})
} if !ok {
outChan, ok := res.Output().(<-chan interface{}) return nil, u.ErrCast()
if !ok { }
res.SetError(u.ErrCast(), cmds.ErrNormal)
return
}
res.SetOutput(nil)
err := util.ProcRmOutput(outChan, res.Stdout(), res.Stderr()) err := util.ProcRmOutput(outChan, res.Stdout(), res.Stderr())
if err != nil { if err != nil {
res.SetError(err, cmds.ErrNormal) return nil, err
} }
return nil, nil
},
}, },
Type: util.RemovedBlock{}, Type: util.RemovedBlock{},
} }