Merge pull request #4194 from ipfs/feat/fuse-fixes

various fixes for /ipfs fuse code

Merge pull request #4194 from ipfs/feat/fuse-fixes
various fixes for /ipfs fuse code
ad004dbf · Jeromy Johnson · GitHub · d9c5d7df · 3e73bba8 · ad004dbf
Commit ad004dbf authored Sep 06, 2017 by Jeromy Johnson Committed by GitHub Sep 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

merkledag.go merkledag.go +6 -1

No files found.
--- a/merkledag.go
+++ b/merkledag.go
@@ -153,8 +153,13 @@ type sesGetter struct {

 func (sg *sesGetter) Get(ctx context.Context, c *cid.Cid) (node.Node, error) {
 	blk, err := sg.bs.GetBlock(ctx, c)
-	if err != nil {
+	switch err {
+	case bserv.ErrNotFound:
+		return nil, ErrNotFound
+	default:
 		return nil, err
+	case nil:
+		// noop
 	}

 	return node.Decode(blk)