# HG changeset patch # User Sascha L. Teichmann # Date 1563356077 -7200 # Node ID c412dff6e1daa824c043839607e64f577b7a2e9c # Parent 8af156928a2db880014c837d342ba124f55881c0 Fixed cases for error strings. diff -r 8af156928a2d -r c412dff6e1da pkg/controllers/pwreset.go --- a/pkg/controllers/pwreset.go Wed Jul 17 11:30:21 2019 +0200 +++ b/pkg/controllers/pwreset.go Wed Jul 17 11:34:37 2019 +0200 @@ -82,9 +82,9 @@ const pwResetRole = "sys_admin" var ( - errTooMuchPasswordResets = errors.New("Too many password resets") - errNoSuchUser = errors.New("User does not exist") - errInvalidUser = errors.New("Invalid user") + errTooMuchPasswordResets = errors.New("too many password resets") + errNoSuchUser = errors.New("user does not exist") + errInvalidUser = errors.New("invalid user") ) var ( @@ -285,7 +285,7 @@ err = tx.QueryRowContext(ctx, findRequestSQL, hash).Scan(&user) switch { case err == sql.ErrNoRows: - return errors.New("This URL is no longer valid.") + return errors.New("this URL is no longer valid") case err != nil: return err } @@ -295,7 +295,7 @@ return err } if n, err2 := res.RowsAffected(); err2 == nil && n == 0 { - return errors.New("User not found") + return errors.New("user not found") } if _, err = tx.ExecContext(ctx, deleteRequestSQL, hash); err != nil { return err diff -r 8af156928a2d -r c412dff6e1da pkg/controllers/srimports.go --- a/pkg/controllers/srimports.go Wed Jul 17 11:30:21 2019 +0200 +++ b/pkg/controllers/srimports.go Wed Jul 17 11:34:37 2019 +0200 @@ -105,7 +105,7 @@ case "false", "0": negateZ = false default: - return fmt.Errorf("Unknown negate-z '%s'", v) + return fmt.Errorf("unknown negate-z '%s'", v) } sr.NegateZ = &negateZ } @@ -118,7 +118,7 @@ case "false", "0", "multibeam", "multi-beam": singleBeam = false default: - return fmt.Errorf("Unknown single-beam '%s'", v) + return fmt.Errorf("unknown single-beam '%s'", v) } sr.SingleBeam = &singleBeam }