Skip to content

Commit a402555

Browse files
committed
fix: still exit with non-zero when there is an unknown err
1 parent 82de268 commit a402555

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

cmd/src/run_migration_compat.go

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,24 @@ func runMigrated() (int, error) {
6666
ctx := context.Background()
6767

6868
err := migratedRootCommand().Run(ctx, os.Args)
69-
if errors.HasType[*cmderrors.UsageError](err) {
70-
return 2, nil
71-
}
72-
if e, ok := err.(*cmderrors.ExitCodeError); ok {
73-
if e.HasError() {
74-
return e.Code(), e
69+
if err != nil {
70+
if errors.HasType[*cmderrors.UsageError](err) {
71+
return 2, nil
7572
}
76-
return e.Code(), nil
77-
}
78-
var exitErr cli.ExitCoder
79-
if errors.AsInterface(err, &exitErr) {
80-
return exitErr.ExitCode(), err
73+
if e, ok := err.(*cmderrors.ExitCodeError); ok {
74+
if e.HasError() {
75+
return e.Code(), e
76+
}
77+
return e.Code(), nil
78+
}
79+
var exitErr cli.ExitCoder
80+
if errors.AsInterface(err, &exitErr) {
81+
return exitErr.ExitCode(), err
82+
}
83+
84+
return 1, err
8185
}
86+
8287
return 0, err
8388
}
8489

0 commit comments

Comments
 (0)