fix hidden merge conflicts
Oh for a CI that runs on merge... License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Jan 30, 2018 at 14:16 UTC
b1dbc1c487f4dfbaf3335ee47175160a6041cbc5
1 file changed
+7
-7
core/coreapi/object.go
+7
-7
@@ -18,8 +18,8 @@ import (
18
"encoding/xml"
19
"errors"
20
"fmt"
21
- node "gx/ipfs/QmNwUEK7QbwSqyKBu3mMtToo8SUc6wQJ7gdZq4gGGJqfnf/go-ipld-format"
22
- cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
21
+ cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
22
+ node "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
23
)
24
25
const inputLimit = 2 << 20
@@ -53,7 +53,7 @@ func (api *ObjectAPI) New(ctx context.Context, opts ...caopts.ObjectNewOption) (
53
n = ft.EmptyDirNode()
54
}
55
56
- _, err = api.node.DAG.Add(n)
56
+ err = api.node.DAG.Add(ctx, n)
57
if err != nil {
58
return nil, err
59
}
@@ -120,7 +120,7 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
120
return nil, err
121
}
122
123
- _, err = api.node.DAG.Add(dagnode)
123
+ err = api.node.DAG.Add(ctx, dagnode)
124
if err != nil {
125
return nil, err
126
}
@@ -217,7 +217,7 @@ func (api *ObjectAPI) AddLink(ctx context.Context, base coreiface.Path, name str
217
return nil, err
218
}
219
220
- nnode, err := e.Finalize(api.node.DAG)
220
+ nnode, err := e.Finalize(ctx, api.node.DAG)
221
if err != nil {
222
return nil, err
223
}
@@ -243,7 +243,7 @@ func (api *ObjectAPI) RmLink(ctx context.Context, base coreiface.Path, link stri
243
return nil, err
244
}
245
246
- nnode, err := e.Finalize(api.node.DAG)
246
+ nnode, err := e.Finalize(ctx, api.node.DAG)
247
if err != nil {
248
return nil, err
249
}
@@ -280,7 +280,7 @@ func (api *ObjectAPI) patchData(ctx context.Context, path coreiface.Path, r io.R
280
}
281
pbnd.SetData(data)
282
283
- _, err = api.node.DAG.Add(pbnd)
283
+ err = api.node.DAG.Add(ctx, pbnd)
284
if err != nil {
285
return nil, err
286
}