Merge pull request #1161 from ipfs/blocks-put-exists

blocks: Don't re-Put blocks we already have

blocks/blockstore/blockstore.go

@@ -64,10 +64,11 @@ func (bs *blockstore) Get(k u.Key) (*blocks.Block, error) {
 }
 
 func (bs *blockstore) Put(block *blocks.Block) error {
-	// Has is cheaper than
 	k := block.Key().DsKey()
+
+	// Has is cheaper than Put, so see if we already have it
 	exists, err := bs.datastore.Has(k)
-	if err != nil && exists {
+	if err == nil && exists {
 		return nil // already stored.
 	}
 	return bs.datastore.Put(k, block.Data)

cmd/ipfs/main.go

@@ -116,7 +116,6 @@ func main() {
 		}
 	}
 
-
 	// ok now handle parse error (which means cli input was wrong,
 	// e.g. incorrect number of args, or nonexistent subcommand)
 	if parseErr != nil {

commands/cli/helptext.go

@@ -14,8 +14,8 @@ const (
 	requiredArg = "<%v>"
 	optionalArg = "[<%v>]"
 	variadicArg = "%v..."
-	shortFlag  = "-%v"
-	longFlag  = "--%v"
+	shortFlag   = "-%v"
+	longFlag    = "--%v"
 	optionType  = "(%v)"
 
 	whitespace = "\r\n\t "

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
 }