make sure to catch the right error so it is displayed as an error on …

…the ui not a 500 (#4945)
go-gitea · Sep 16, 2018 · acb6f8a · acb6f8a
1 parent f6eb669
commit acb6f8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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):