correctly handle the output of `pin update`
fixes #4999 License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Jul 19, 2018 at 17:49 UTC
82e006ead10d775e78c1a31f18e14965eea4116f
1 file changed
+9
-6
core/commands/pin.go
+9
-6
@@ -13,14 +13,13 @@ import (
13
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
14
pin "github.com/ipfs/go-ipfs/pin"
15
uio "github.com/ipfs/go-ipfs/unixfs/io"
16
+
17
bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
18
+ "gx/ipfs/QmQwgv79RHrRnoXmhnpC1BPtY55HHeneGMpPwmmBU1fUAG/go-verifcid"
19
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
20
+ offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
21
path "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path"
22
resolver "gx/ipfs/QmYKNMEUK7nCVAefgXF1LVtZEZg3uRmBqiae4FJRXDNAyJ/go-path/resolver"
20
-
21
- u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
22
- "gx/ipfs/QmQwgv79RHrRnoXmhnpC1BPtY55HHeneGMpPwmmBU1fUAG/go-verifcid"
23
- offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
23
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
24
"gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
25
)
@@ -416,9 +415,13 @@ new pin and removing the old one.
415
},
416
Marshalers: cmds.MarshalerMap{
417
cmds.Text: func(res cmds.Response) (io.Reader, error) {
419
- added, ok := res.Output().(*PinOutput)
418
+ v, err := unwrapOutput(res.Output())
419
+ if err != nil {
420
+ return nil, err
421
+ }
422
+ added, ok := v.(*PinOutput)
423
if !ok {
421
- return nil, u.ErrCast()
424
+ return nil, e.TypeErr(added, v)
425
}
426
427
buf := new(bytes.Buffer)