提交 a9417a14 作者: Jakub Sztandera

fix `ipfs pin verify --verbose` not working

Resolves https://github.com/ipfs/go-ipfs/issues/4761

License: MIT
Signed-off-by: 's avatarJakub Sztandera <kubuxu@protonmail.ch>
上级 f1125f00
...@@ -462,25 +462,23 @@ var verifyPinCmd = &cmds.Command{ ...@@ -462,25 +462,23 @@ var verifyPinCmd = &cmds.Command{
cmds.Text: func(res cmds.Response) (io.Reader, error) { cmds.Text: func(res cmds.Response) (io.Reader, error) {
quiet, _, _ := res.Request().Option("quiet").Bool() quiet, _, _ := res.Request().Option("quiet").Bool()
outChan, ok := res.Output().(<-chan interface{}) out, err := unwrapOutput(res.Output())
if err != nil {
return nil, err
}
r, ok := out.(*PinVerifyRes)
if !ok { if !ok {
return nil, u.ErrCast() return nil, e.TypeErr(r, out)
} }
rdr, wtr := io.Pipe() buf := &bytes.Buffer{}
go func() {
defer wtr.Close()
for r0 := range outChan {
r := r0.(*PinVerifyRes)
if quiet && !r.Ok { if quiet && !r.Ok {
fmt.Fprintf(wtr, "%s\n", r.Cid) fmt.Fprintf(buf, "%s\n", r.Cid)
} else if !quiet { } else if !quiet {
r.Format(wtr) r.Format(buf)
}
} }
}()
return rdr, nil return buf, nil
}, },
}, },
} }
......
...@@ -36,6 +36,15 @@ test_pins() { ...@@ -36,6 +36,15 @@ test_pins() {
cat hashes | ipfs pin add $EXTRA_ARGS cat hashes | ipfs pin add $EXTRA_ARGS
' '
test_expect_success "see if verify works" '
ipfs pin verify
'
test_expect_success "see if verify --verbose works" '
ipfs pin verify --verbose > verify_out &&
test $(cat verify_out | wc -l) > 8
'
test_expect_success "unpin those hashes" ' test_expect_success "unpin those hashes" '
cat hashes | ipfs pin rm cat hashes | ipfs pin rm
' '
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论