Skip to content

Commit

Permalink
Merge pull request #5509 from ipfs/chores/add-sessions-to-ls-command-…
Browse files Browse the repository at this point in the history
…4908

Add sessions when fetching MerkleDAG in LS
  • Loading branch information
Stebalien authored Oct 2, 2018
2 parents d8ed9ab + 47f3c40 commit 080b0e1
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion core/commands/ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ The JSON output contains type information.
}

output := make([]LsObject, len(req.Arguments()))
ng := merkledag.NewSession(req.Context(), nd.DAG)
ro := merkledag.NewReadOnlyDagService(ng)

for i, dagnode := range dagnodes {
dir, err := uio.NewDirectoryFromNode(nd.DAG, dagnode)
dir, err := uio.NewDirectoryFromNode(ro, dagnode)
if err != nil && err != uio.ErrNotADir {
res.SetError(fmt.Errorf("the data in %s (at %q) is not a UnixFS directory: %s", dagnode.Cid(), paths[i], err), cmdkit.ErrNormal)
return
Expand Down

0 comments on commit 080b0e1

Please sign in to comment.