init -f fix and output
Juan Batiz-Benet committed
Sep 19, 2014 at 18:57 UTC
d1c4ffba7c00fc1fc9788269019508f8af5c3ddd
1 file changed
+6
-2
cmd/ipfs/init.go
+6
-2
@@ -43,6 +43,7 @@ func initCmd(c *commander.Command, inp []string) error {
43
}
44
}
45
46
+ u.POut("initializing ipfs node at %s\n", configpath)
47
filename, err := config.Filename(configpath + "/config")
48
if err != nil {
49
return errors.New("Couldn't get home directory path")
@@ -53,8 +54,10 @@ func initCmd(c *commander.Command, inp []string) error {
54
if !ok {
55
return errors.New("failed to parse force flag")
56
}
56
- if fi != nil || (err != nil && !os.IsNotExist(err)) && !force {
57
- return errors.New("ipfs configuration file already exists!\nReinitializing would overwrite your keys.\n(use -f to force overwrite)")
57
+ if fi != nil || (err != nil && !os.IsNotExist(err)) {
58
+ if !force {
59
+ return errors.New("ipfs configuration file already exists!\nReinitializing would overwrite your keys.\n(use -f to force overwrite)")
60
+ }
61
}
62
cfg := new(config.Config)
63
@@ -78,6 +81,7 @@ func initCmd(c *commander.Command, inp []string) error {
81
return errors.New("Bitsize less than 1024 is considered unsafe.")
82
}
83
84
+ u.POut("generating key pair\n")
85
sk, pk, err := ci.GenerateKeyPair(ci.RSA, nbits)
86
if err != nil {
87
return err