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

Merge pull request #5667 from bitness/typo-fix 

Fix error name typo (ErrInvalidWorikingDirectory)
This commit is contained in:
Guillaume J. Charmes 2014-05-07 16:53:08 -07:00
parent c7712b350a d3150e0927
commit ed00ba84ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runconfig/parse.go
View File

@ -14,7 +14,7 @@ import (
) )
var ( var (
ErrInvalidWorikingDirectory = fmt.Errorf("The working directory is invalid. It needs to be an absolute path.") ErrInvalidWorkingDirectory = fmt.Errorf("The working directory is invalid. It needs to be an absolute path.")
ErrConflictAttachDetach = fmt.Errorf("Conflicting options: -a and -d") ErrConflictAttachDetach = fmt.Errorf("Conflicting options: -a and -d")
ErrConflictDetachAutoRemove = fmt.Errorf("Conflicting options: --rm and -d") ErrConflictDetachAutoRemove = fmt.Errorf("Conflicting options: --rm and -d")
) )
@ -95,7 +95,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf
return nil, nil, cmd, ErrConflictAttachDetach return nil, nil, cmd, ErrConflictAttachDetach
} }
if *flWorkingDir != "" && !path.IsAbs(*flWorkingDir) { if *flWorkingDir != "" && !path.IsAbs(*flWorkingDir) {
return nil, nil, cmd, ErrInvalidWorikingDirectory return nil, nil, cmd, ErrInvalidWorkingDirectory
} }
if *flDetach && *flAutoRemove { if *flDetach && *flAutoRemove {
return nil, nil, cmd, ErrConflictDetachAutoRemove return nil, nil, cmd, ErrConflictDetachAutoRemove