kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Change the errors.New() with fmt.Errof

Browse source
This commit is contained in:
creack 2013-03-15 03:58:43 -07:00
parent 137af244ee
commit b2cf5041cd
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fs/store_test.go
View file

@ -1,7 +1,6 @@
package fs package fs
import ( import (
"errors"
"fmt" "fmt"
"github.com/dotcloud/docker/fake" "github.com/dotcloud/docker/fake"
"github.com/dotcloud/docker/future" "github.com/dotcloud/docker/future"
@ -261,7 +260,7 @@ func healthCheck(store *Store) error {
for _, img := range images { for _, img := range images {
// Check for duplicate IDs per path // Check for duplicate IDs per path
if _, exists := IDs[img.Id]; exists { if _, exists := IDs[img.Id]; exists {
return errors.New(fmt.Sprintf("Duplicate ID: %s", img.Id)) return fmt.Errorf("Duplicate ID: %s", img.Id)
} else { } else {
IDs[img.Id] = true IDs[img.Id] = true
} }
@ -274,7 +273,7 @@ func healthCheck(store *Store) error {
// Check non-existing parents // Check non-existing parents
for parent := range parents { for parent := range parents {
if _, exists := parents[parent]; !exists { if _, exists := parents[parent]; !exists {
return errors.New("Reference to non-registered parent: " + parent) return fmt.Errorf("Reference to non-registered parent: %s", parent)
} }
} }
return nil return nil

7
mount_test.go
View file

@ -1,6 +1,7 @@
package docker package docker
import ( import (
"fmt"
"github.com/dotcloud/docker/fake" "github.com/dotcloud/docker/fake"
"github.com/dotcloud/docker/fs" "github.com/dotcloud/docker/fs"
"io/ioutil" "io/ioutil"
@ -9,7 +10,7 @@ import (
) )
// Look for inconsistencies in a store. // Look for inconsistencies in a store.
func healthCheck(store *Store) error { func healthCheck(store *fs.Store) error {
parents := make(map[string]bool) parents := make(map[string]bool)
paths, err := store.Paths() paths, err := store.Paths()
if err != nil { if err != nil {
@ -24,7 +25,7 @@ func healthCheck(store *Store) error {
for _, img := range images { for _, img := range images {
// Check for duplicate IDs per path // Check for duplicate IDs per path
if _, exists := IDs[img.Id]; exists { if _, exists := IDs[img.Id]; exists {
return errors.New(fmt.Sprintf("Duplicate ID: %s", img.Id)) return fmt.Errorf("Duplicate ID: %s", img.Id)
} else { } else {
IDs[img.Id] = true IDs[img.Id] = true
} }
@ -37,7 +38,7 @@ func healthCheck(store *Store) error {
// Check non-existing parents // Check non-existing parents
for parent := range parents { for parent := range parents {
if _, exists := parents[parent]; !exists { if _, exists := parents[parent]; !exists {
return errors.New("Reference to non-registered parent: " + parent) return fmt.Errorf("Reference to non-registered parent: %s", parent)
} }
} }
return nil return nil