docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use more idiomatic go in if conditions. 

Signed-off-by: Ying Li <ying.li@docker.com>
This commit is contained in:
Ying Li 2015-10-13 16:18:59 -07:00
parent 9290507a1f
commit 09a041be14
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/storage/database.go
View File

@ -53,11 +53,11 @@ func (db *SQLStorage) UpdateMany(gun string, updates []MetaUpdate) error {
}
rollback := func(err error) error {
query := tx.Rollback()
if query.Error != nil {
if rxErr := tx.Rollback().Error; rxErr != nil {
logrus.Error("Failed on Tx rollback with error: ", err.Error())
return rxErr
}
return query.Error
return err
}
var (
@ -88,7 +88,7 @@ func (db *SQLStorage) UpdateMany(gun string, updates []MetaUpdate) error {
}
// it's previously been added, which means it's a duplicate entry
// in the same transaction
if added[row.ID] {
if _, ok := added[row.ID]; ok {
return rollback(&ErrOldVersion{})
}
added[row.ID] = true