fix public will not be reused as public key after deleting as deploy key (#5671) (#5684)

lunny · techknowlogick · commit 483aa06b07db · 2019-01-10T09:23:33.000-05:00
diff --git a/models/ssh_key.go b/models/ssh_key.go
@@ -844,6 +844,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
`@@ -844,6 +844,11 @@ func DeleteDeployKey(doer *User, id int64) error {`
`844`	`844`	`if err = deletePublicKeys(sess, key.KeyID); err != nil {`
`845`	`845`	`return err`
`846`	`846`	`}`
	`847`	`+`
	`848`	`+ // after deleted the public keys, should rewrite the public keys file`
	`849`	`+ if err = rewriteAllPublicKeys(sess); err != nil {`
	`850`	`+ return err`
	`851`	`+ }`
`847`	`852`	`}`
`848`	`853`
`849`	`854`	`return sess.Commit()`