m79305216
/
gitea
forked from p85947160/gitea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: err != nil check, just return error instead (#5093)

This commit is contained in:
Bo-Yi Wu 2018-10-18 12:51:07 +08:00 committed by techknowlogick
parent e4b8103ac7
commit 1e34413238
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/admin.go
View File

@ -412,16 +412,12 @@ func runAddOauth(c *cli.Context) error {
return err return err
} }
if err := models.CreateLoginSource(&models.LoginSource{ return models.CreateLoginSource(&models.LoginSource{
Type: models.LoginOAuth2, Type: models.LoginOAuth2,
Name: c.String("name"), Name: c.String("name"),
IsActived: true, IsActived: true,
Cfg: parseOAuth2Config(c), Cfg: parseOAuth2Config(c),
}); err != nil { })
return err
}
return nil
} }
func runUpdateOauth(c *cli.Context) error { func runUpdateOauth(c *cli.Context) error {
@ -492,11 +488,7 @@ func runUpdateOauth(c *cli.Context) error {
oAuth2Config.CustomURLMapping = customURLMapping oAuth2Config.CustomURLMapping = customURLMapping
source.Cfg = oAuth2Config source.Cfg = oAuth2Config
if err := models.UpdateSource(source); err != nil { return models.UpdateSource(source)
return err
}
return nil
} }
func runListAuth(c *cli.Context) error { func runListAuth(c *cli.Context) error {
@ -543,8 +535,5 @@ func runDeleteAuth(c *cli.Context) error {
return err return err
} }
if err = models.DeleteSource(source); err != nil { return models.DeleteSource(source)
return err
}
return nil
} }

5
models/migrations/v68.go
View File

@ -205,9 +205,6 @@ func reformatAndRemoveIncorrectTopics(x *xorm.Engine) (err error) {
return err return err
} }
} }
if err := sess.Commit(); err != nil {
return err
}
return nil return sess.Commit()
} }