use correct context in pubfunc pinning
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Jan 11, 2016 at 06:04 UTC
5fcd9a1f8e0fb3a3c24eef9f123b2b4dcc2585d4
2 files changed
+5
-4
core/core.go
+4
-4
@@ -475,15 +475,15 @@ func (n *IpfsNode) loadFilesRoot() error {
475
dsk := ds.NewKey("/local/filesroot")
476
pf := func(ctx context.Context, k key.Key) error {
477
ds := n.Repo.Datastore()
478
- if old, err := ds.Get(dsk); err == nil {
479
- _ = n.Pinning.Unpin(n.Context(), key.Key(old.([]byte)), true)
478
+ if old, err := ds.Get(dsk); err == nil && old != nil {
479
+ _ = n.Pinning.Unpin(ctx, key.Key(old.([]byte)), true)
480
}
481
- nnd, err := n.DAG.Get(n.Context(), k)
481
+ nnd, err := n.DAG.Get(ctx, k)
482
if err != nil {
483
return err
484
}
485
486
- if err := n.Pinning.Pin(n.Context(), nnd, true); err != nil {
486
+ if err := n.Pinning.Pin(ctx, nnd, true); err != nil {
487
return err
488
}
489
mfs/ops.go
+1
@@ -162,6 +162,7 @@ func Mkdir(r *Root, pth string, mkparents bool, flush bool) error {
162
func Lookup(r *Root, path string) (FSNode, error) {
163
dir, ok := r.GetValue().(*Directory)
164
if !ok {
165
+ log.Error("root not a dir: %#v", r.GetValue())
166
return nil, errors.New("root was not a directory")
167
}
168