Browse Source

Fix lint errors (#2547)

release/v1.3
Ethan Koenig 5 years ago
committed by Lauris BH
parent
commit
4cb9394a97
  1. 6
      models/gpg_key.go
  2. 6
      models/issue.go
  3. 5
      models/login_source.go
  4. 6
      models/migrations/v16.go
  5. 5
      models/migrations/v21.go
  6. 6
      models/org.go
  7. 6
      models/ssh_key.go
  8. 5
      modules/lfs/content_store.go
  9. 5
      modules/log/file.go

6
models/gpg_key.go

@ -282,11 +282,7 @@ func DeleteGPGKey(doer *User, id int64) (err error) {
return err
}
if err = sess.Commit(); err != nil {
return err
}
return nil
return sess.Commit()
}
// CommitVerification represents a commit validation of signature

6
models/issue.go

@ -571,11 +571,7 @@ func (issue *Issue) ReadBy(userID int64) error {
return err
}
if err := setNotificationStatusReadIfUnread(x, userID, issue.ID); err != nil {
return err
}
return nil
return setNotificationStatusReadIfUnread(x, userID, issue.ID)
}
func updateIssueCols(e Engine, issue *Issue, cols ...string) error {

5
models/login_source.go

@ -498,10 +498,7 @@ func SMTPAuth(a smtp.Auth, cfg *SMTPConfig) error {
}
if ok, _ := c.Extension("AUTH"); ok {
if err = c.Auth(a); err != nil {
return err
}
return nil
return c.Auth(a)
}
return ErrUnsupportedLoginType
}

6
models/migrations/v16.go

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

5
models/migrations/v21.go

@ -51,8 +51,5 @@ func useNewPublickeyFormat(x *xorm.Engine) error {
}
f.Close()
if err = os.Rename(tmpPath, fpath); err != nil {
return err
}
return nil
return os.Rename(tmpPath, fpath)
}

6
models/org.go

@ -235,11 +235,7 @@ func DeleteOrganization(org *User) (err error) {
}
}
if err = sess.Commit(); err != nil {
return err
}
return nil
return sess.Commit()
}
func deleteOrg(e *xorm.Session, u *User) error {

6
models/ssh_key.go

@ -599,11 +599,7 @@ func RewriteAllPublicKeys() error {
defer f.Close()
}
if err = os.Rename(tmpPath, fPath); err != nil {
return err
}
return nil
return os.Rename(tmpPath, fPath)
}
// ________ .__ ____ __.

5
modules/lfs/content_store.go

@ -70,10 +70,7 @@ func (s *ContentStore) Put(meta *models.LFSMetaObject, r io.Reader) error {
return errHashMismatch
}
if err := os.Rename(tmpPath, path); err != nil {
return err
}
return nil
return os.Rename(tmpPath, path)
}
// Exists returns true if the object exists in the content store.

5
modules/log/file.go

@ -110,10 +110,7 @@ func (w *FileLogWriter) StartLogger() error {
return err
}
w.mw.SetFd(fd)
if err = w.initFd(); err != nil {
return err
}
return nil
return w.initFd()
}
func (w *FileLogWriter) docheck(size int) {

Loading…
Cancel
Save