use correct context in pubfunc pinning

whyrusleeping · whyrusleeping · commit 46b8ba82ad58 · 2016-01-11T06:04:04.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/core.go b/core/core.go
@@ -475,15 +475,15 @@ func (n *IpfsNode) loadFilesRoot() error {
 	dsk := ds.NewKey("/local/filesroot")
 	pf := func(ctx context.Context, k key.Key) error {
 		ds := n.Repo.Datastore()
-		if old, err := ds.Get(dsk); err == nil {
-			_ = n.Pinning.Unpin(n.Context(), key.Key(old.([]byte)), true)
+		if old, err := ds.Get(dsk); err == nil && old != nil {
+			_ = n.Pinning.Unpin(ctx, key.Key(old.([]byte)), true)
 		}
-		nnd, err := n.DAG.Get(n.Context(), k)
+		nnd, err := n.DAG.Get(ctx, k)
 		if err != nil {
 			return err
 		}
 
-		if err := n.Pinning.Pin(n.Context(), nnd, true); err != nil {
+		if err := n.Pinning.Pin(ctx, nnd, true); err != nil {
 			return err
 		}
 
diff --git a/mfs/ops.go b/mfs/ops.go
@@ -162,6 +162,7 @@ func Mkdir(r *Root, pth string, mkparents bool, flush bool) error {
 func Lookup(r *Root, path string) (FSNode, error) {
 	dir, ok := r.GetValue().(*Directory)
 	if !ok {
+		log.Error("root not a dir: %#v", r.GetValue())
 		return nil, errors.New("root was not a directory")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -475,15 +475,15 @@ func (n *IpfsNode) loadFilesRoot() error {`
`475`	`475`	`dsk := ds.NewKey("/local/filesroot")`
`476`	`476`	`pf := func(ctx context.Context, k key.Key) error {`
`477`	`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`	`480`	`}`
`481`		`- nnd, err := n.DAG.Get(n.Context(), k)`
	`481`	`+ nnd, err := n.DAG.Get(ctx, k)`
`482`	`482`	`if err != nil {`
`483`	`483`	`return err`
`484`	`484`	`}`
`485`	`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`	`487`	`return err`
`488`	`488`	`}`
`489`	`489`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ func Mkdir(r *Root, pth string, mkparents bool, flush bool) error {`
`162`	`162`	`func Lookup(r *Root, path string) (FSNode, error) {`
`163`	`163`	`dir, ok := r.GetValue().(*Directory)`
`164`	`164`	`if !ok {`
	`165`	`+ log.Error("root not a dir: %#v", r.GetValue())`
`165`	`166`	`return nil, errors.New("root was not a directory")`
`166`	`167`	`}`
`167`	`168`