cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

cmd/geth: make import cmd exit with 1 if import errors occurred (#21244)

Browse Source 
The import command should not return a 0 status
code if the import finishes prematurely becaues
of an import error.

Returning the error causes the program to exit with 1
if the err is non nil.

Signed-off-by: meows <b5c6@protonmail.com>
This commit is contained in:
meowsbits 2020-06-24 15:01:58 -05:00 committed by GitHub
parent 0c82928981
commit 413358abb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/geth/chaincmd.go
View File

@ -299,13 +299,17 @@ func importChain(ctx *cli.Context) error {
// Import the chain // Import the chain
start := time.Now() start := time.Now()
var importErr error
if len(ctx.Args()) == 1 { if len(ctx.Args()) == 1 {
if err := utils.ImportChain(chain, ctx.Args().First()); err != nil { if err := utils.ImportChain(chain, ctx.Args().First()); err != nil {
importErr = err
log.Error("Import error", "err", err) log.Error("Import error", "err", err)
} }
} else { } else {
for _, arg := range ctx.Args() { for _, arg := range ctx.Args() {
if err := utils.ImportChain(chain, arg); err != nil { if err := utils.ImportChain(chain, arg); err != nil {
importErr = err
log.Error("Import error", "file", arg, "err", err) log.Error("Import error", "file", arg, "err", err)
} }
} }
@ -358,7 +362,7 @@ func importChain(ctx *cli.Context) error {
utils.Fatalf("Failed to read database iostats: %v", err) utils.Fatalf("Failed to read database iostats: %v", err)
} }
fmt.Println(ioStats) fmt.Println(ioStats)
return nil return importErr
} }
func exportChain(ctx *cli.Context) error { func exportChain(ctx *cli.Context) error {