Skip to content

Commit acb6f8a

Browse files
adelowolafriks
authored andcommitted
make sure to catch the right error so it is displayed as an error on the ui not a 500 (#4945)
1 parent f6eb669 commit acb6f8a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

models/ssh_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ func AddDeployKey(repoID int64, name, content string, readOnly bool) (*DeployKey
732732

733733
key, err := addDeployKey(sess, pkey.ID, repoID, name, pkey.Fingerprint, accessMode)
734734
if err != nil {
735-
return nil, fmt.Errorf("addDeployKey: %v", err)
735+
return nil, err
736736
}
737737

738738
return key, sess.Commit()

routers/repo/setting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ func DeployKeysPost(ctx *context.Context, form auth.AddKeyForm) {
586586
if err != nil {
587587
ctx.Data["HasError"] = true
588588
switch {
589-
case models.IsErrKeyAlreadyExist(err):
589+
case models.IsErrDeployKeyAlreadyExist(err):
590590
ctx.Data["Err_Content"] = true
591591
ctx.RenderWithErr(ctx.Tr("repo.settings.key_been_used"), tplDeployKeys, &form)
592592
case models.IsErrKeyNameAlreadyUsed(err):

0 commit comments

Comments
 (0)