aboutsummaryrefslogtreecommitdiff
path: root/models/migrations
diff options
context:
space:
mode:
authorKyle McCullough <kylemcc@gmail.com>2017-03-29 18:02:07 -0500
committer无闻 <u@gogs.io>2017-03-29 19:02:07 -0400
commit09723ec0e5be9aae41d6fc3ad87d3eabe1035376 (patch)
tree0fb509177b9fd3546f70a3a91c4e4468204348d2 /models/migrations
parent864761c2d0d77b40afc8271f43f3dff91d5b2b11 (diff)
migration.v17: handle mysql error (#4361)
Diffstat (limited to 'models/migrations')
-rw-r--r--models/migrations/v17.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/models/migrations/v17.go b/models/migrations/v17.go
index c6fa18d5..13d5a76c 100644
--- a/models/migrations/v17.go
+++ b/models/migrations/v17.go
@@ -12,7 +12,7 @@ import (
func removeInvalidProtectBranchWhitelist(x *xorm.Engine) error {
_, err := x.Exec("DELETE FROM protect_branch_whitelist WHERE protect_branch_id = 0")
- if err != nil && strings.Contains(err.Error(), "no such table") {
+ if err != nil && (strings.Contains(err.Error(), "no such table") || strings.Contains(err.Error(), "doesn't exist")) {
return nil
}
return err