From 384ca525b4178a3eb7447a7f8c9dfcd3dbbbf5b1 Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Fri, 13 Mar 2015 16:02:14 -0700 Subject: [PATCH] Clean up fsrepo path handling --- repo/fsrepo/fsrepo.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go index 0a9ea02a7..76c58214b 100644 --- a/repo/fsrepo/fsrepo.go +++ b/repo/fsrepo/fsrepo.go @@ -80,20 +80,15 @@ func open(repoPath string) (repo.Repo, error) { packageLock.Lock() defer packageLock.Unlock() - r := &FSRepo{ - path: path.Clean(repoPath), - state: unopened, // explicitly set for clarity - } - - expPath, err := u.TildeExpansion(r.path) + expPath, err := u.TildeExpansion(path.Clean(repoPath)) if err != nil { return nil, err } - r.path = expPath - if r.state != unopened { - return nil, debugerror.Errorf("repo is %s", r.state) + r := &FSRepo{ + path: expPath, } + if !isInitializedUnsynced(r.path) { return nil, debugerror.New("ipfs not initialized, please run 'ipfs init'") }