From 2f660aff7a942f4bc2a4f939b943986ed1affe4b Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Mon, 30 Dec 2013 20:55:33 -0500
Subject: [PATCH] Improve no such node error messages

---
 model.go        | 7 +------
 model_puller.go | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/model.go b/model.go
index ddfcf8598..054d28c37 100644
--- a/model.go
+++ b/model.go
@@ -12,7 +12,6 @@ acquire locks, but document what locks they require.
 */
 
 import (
-	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -40,10 +39,6 @@ type Model struct {
 	lastIdxBcastRequest time.Time
 }
 
-var (
-	errNoSuchNode = errors.New("no such node")
-)
-
 const (
 	FlagDeleted = 1 << 12
 
@@ -231,7 +226,7 @@ func (m *Model) RequestGlobal(nodeID, name string, offset uint64, size uint32, h
 	nc, ok := m.nodes[nodeID]
 	m.RUnlock()
 	if !ok {
-		return nil, errNoSuchNode
+		return nil, fmt.Errorf("RequestGlobal: no such node: %s", nodeID)
 	}
 
 	if opts.Debug.TraceNet {
diff --git a/model_puller.go b/model_puller.go
index 6ef08755f..7cbc10c75 100644
--- a/model_puller.go
+++ b/model_puller.go
@@ -34,7 +34,7 @@ func (m *Model) pullFile(name string) error {
 	m.RUnlock()
 
 	if len(nodeIDs) == 0 {
-		return errNoSuchNode
+		return fmt.Errorf("%s: no connected nodes with file available", name)
 	}
 
 	filename := path.Join(m.dir, name)