Merge pull request #1087 from williammartin/master

hqhq · web-flow · commit 3597b7b743c1 · 2016-09-29T09:19:45.000+08:00
Fix typo when container does not exist
diff --git a/libcontainer/factory_linux.go b/libcontainer/factory_linux.go
@@ -281,7 +281,7 @@ func (l *LinuxFactory) loadState(root, id string) (*State, error) {
 	f, err := os.Open(filepath.Join(root, stateFilename))
 	if err != nil {
 		if os.IsNotExist(err) {
-			return nil, newGenericError(fmt.Errorf("container %q does not exists", id), ContainerNotExists)
+			return nil, newGenericError(fmt.Errorf("container %q does not exist", id), ContainerNotExists)
 		}
 		return nil, newGenericError(err, SystemError)
 	}

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ func (l LinuxFactory) loadState(root, id string) (State, error) {`
`281`	`281`	`f, err := os.Open(filepath.Join(root, stateFilename))`
`282`	`282`	`if err != nil {`
`283`	`283`	`if os.IsNotExist(err) {`
`284`		`- return nil, newGenericError(fmt.Errorf("container %q does not exists", id), ContainerNotExists)`
	`284`	`+ return nil, newGenericError(fmt.Errorf("container %q does not exist", id), ContainerNotExists)`
`285`	`285`	`}`
`286`	`286`	`return nil, newGenericError(err, SystemError)`
`287`	`287`	`}`