From b71ef8354e11f67bd977c05189f630da0973cf05 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sat, 29 Apr 2017 13:01:22 -0700 Subject: [PATCH] Fix gateway handling of sharded directories License: MIT Signed-off-by: Jeromy --- test/sharness/t0260-sharding-flag.sh | 6 ++++++ unixfs/io/dagreader.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/sharness/t0260-sharding-flag.sh b/test/sharness/t0260-sharding-flag.sh index a5897cdbbaf..39d96712bc4 100755 --- a/test/sharness/t0260-sharding-flag.sh +++ b/test/sharness/t0260-sharding-flag.sh @@ -55,6 +55,12 @@ test_expect_success "sharded and unsharded output look the same" ' test_cmp sharded_out unsharded_out ' +test_expect_success "ipfs cat error output the same" ' + test_expect_code 1 ipfs cat "$SHARDED" 2> sharded_err && + test_expect_code 1 ipfs cat "$UNSHARDED" 2> unsharded_err && + test_cmp sharded_err unsharded_err +' + test_add_large_dir_v1() { exphash="$1" test_expect_success "ipfs add (CIDv1) on very large directory succeeds" ' diff --git a/unixfs/io/dagreader.go b/unixfs/io/dagreader.go index 48aa9136996..9abfe0c9df2 100644 --- a/unixfs/io/dagreader.go +++ b/unixfs/io/dagreader.go @@ -45,7 +45,7 @@ func NewDagReader(ctx context.Context, n node.Node, serv mdag.DAGService) (DagRe } switch pb.GetType() { - case ftpb.Data_Directory: + case ftpb.Data_Directory, ftpb.Data_HAMTShard: // Dont allow reading directories return nil, ErrIsDir case ftpb.Data_File, ftpb.Data_Raw: