From 09723ec0e5be9aae41d6fc3ad87d3eabe1035376 Mon Sep 17 00:00:00 2001
From: Kyle McCullough <kylemcc@gmail.com>
Date: Wed, 29 Mar 2017 18:02:07 -0500
Subject: [PATCH] migration.v17: handle mysql error (#4361)
---
models/migrations/v17.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/models/migrations/v17.go b/models/migrations/v17.go
index c6fa18d56..13d5a76c9 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