From a0af9f5e8d19d1ed469ff1ab025fd1923075cd16 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tv@eagain.net>
Date: Tue, 28 Apr 2015 16:18:09 -0700
Subject: [PATCH] If ErrNoRepo is not an error value anymore, then make it an
error type
---
repo/fsrepo/fsrepo.go | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go
index 1717dfd91..391e00882 100644
--- a/repo/fsrepo/fsrepo.go
+++ b/repo/fsrepo/fsrepo.go
@@ -40,11 +40,20 @@ Please run the ipfs migration tool before continuing.
` + migrationInstructions
var (
- ErrNoRepo = func (path string) error { return fmt.Errorf("no ipfs repo found in '%s'. please run: ipfs init ", path) }
ErrNoVersion = errors.New("no version file found, please run 0-to-1 migration tool.\n" + migrationInstructions)
ErrOldRepo = errors.New("ipfs repo found in old '~/.go-ipfs' location, please run migration tool.\n" + migrationInstructions)
)
+type NoRepoError struct {
+ Path string
+}
+
+var _ error = NoRepoError{}
+
+func (err NoRepoError) Error() string {
+ return fmt.Sprintf("no ipfs repo found in '%s'. please run: ipfs init ", err.Path)
+}
+
const (
leveldbDirectory = "datastore"
flatfsDirectory = "blocks"
@@ -172,7 +181,7 @@ func checkInitialized(path string) error {
if isInitializedUnsynced(alt) {
return ErrOldRepo
}
- return ErrNoRepo(path)
+ return NoRepoError{Path: path}
}
return nil
}
--
GitLab