From acb6f8a518678278368f76d42e6d0763a21e6e9b Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Sun, 16 Sep 2018 16:27:43 +0100 Subject: [PATCH] make sure to catch the right error so it is displayed as an error on the ui not a 500 (#4945) --- models/ssh_key.go | 2 +- routers/repo/setting.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/ssh_key.go b/models/ssh_key.go index 9c839755c..c2836e688 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -732,7 +732,7 @@ func AddDeployKey(repoID int64, name, content string, readOnly bool) (*DeployKey key, err := addDeployKey(sess, pkey.ID, repoID, name, pkey.Fingerprint, accessMode) if err != nil { - return nil, fmt.Errorf("addDeployKey: %v", err) + return nil, err } return key, sess.Commit() diff --git a/routers/repo/setting.go b/routers/repo/setting.go index dc558ff20..ff6b07f8e 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -586,7 +586,7 @@ func DeployKeysPost(ctx *context.Context, form auth.AddKeyForm) { if err != nil { ctx.Data["HasError"] = true switch { - case models.IsErrKeyAlreadyExist(err): + case models.IsErrDeployKeyAlreadyExist(err): ctx.Data["Err_Content"] = true ctx.RenderWithErr(ctx.Tr("repo.settings.key_been_used"), tplDeployKeys, &form) case models.IsErrKeyNameAlreadyUsed(err):