fix public will not be reused as public key after deleting as deploy key (go-gitea#5671)

lunny · lunny · commit 477c1283e920 · 2019-01-10T12:14:06.000+08:00
diff --git a/models/ssh_key.go b/models/ssh_key.go
@@ -826,6 +826,11 @@ func DeleteDeployKey(doer *User, id int64) error {
 		if err = deletePublicKeys(sess, key.KeyID); err != nil {
 			return err
 		}
+
+		// after deleted the public keys, should rewrite the public keys file
+		if err = rewriteAllPublicKeys(sess); err != nil {
+			return err
+		}
 	}
 
 	return sess.Commit()

Original file line number	Diff line number	Diff line change
`@@ -826,6 +826,11 @@ func DeleteDeployKey(doer *User, id int64) error {`
`826`	`826`	`if err = deletePublicKeys(sess, key.KeyID); err != nil {`
`827`	`827`	`return err`
`828`	`828`	`}`
	`829`	`+`
	`830`	`+ // after deleted the public keys, should rewrite the public keys file`
	`831`	`+ if err = rewriteAllPublicKeys(sess); err != nil {`
	`832`	`+ return err`
	`833`	`+ }`
`829`	`834`	`}`
`830`	`835`
`831`	`836`	`return sess.Commit()`