fix(build): fixed broken build, unreachable code in migrator.go

torkelo · torkelo · commit 5ec86a9ef4db · 2016-09-30T09:23:26.000+02:00
diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go
@@ -133,11 +133,6 @@ func (mg *Migrator) exec(m Migration, sess *xorm.Session) error {
 		mg.Logger.Error("Executing migration failed", "id", m.Id(), "error", err)
 		return err
 	}
-	return nil
-
-	if err != nil {
-		return err
-	}
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,6 @@ func (mg Migrator) exec(m Migration, sess xorm.Session) error {`
`133`	`133`	`mg.Logger.Error("Executing migration failed", "id", m.Id(), "error", err)`
`134`	`134`	`return err`
`135`	`135`	`}`
`136`		`- return nil`
`137`		`-`
`138`		`- if err != nil {`
`139`		`- return err`
`140`		`- }`
`141`	`136`
`142`	`137`	`return nil`
`143`	`138`	`}`