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

opts/opts.go: fix typo 

Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
This commit is contained in:
Ma Shimiao 2015-09-14 13:42:33 +08:00 committed by Vincent Demeester
parent 2d2863ebd5
commit 863be38db7
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
opts/opts.go
View File

@ -223,30 +223,30 @@ func validatePath(val string, validator func(string) bool) (string, error) {
return val, fmt.Errorf("bad format for path: %s", val) return val, fmt.Errorf("bad format for path: %s", val)
} }
splited := strings.SplitN(val, ":", 3) split := strings.SplitN(val, ":", 3)
if splited[0] == "" { if split[0] == "" {
return val, fmt.Errorf("bad format for path: %s", val) return val, fmt.Errorf("bad format for path: %s", val)
} }
switch len(splited) { switch len(split) {
case 1: case 1:
containerPath = splited[0] containerPath = split[0]
val = path.Clean(containerPath) val = path.Clean(containerPath)
case 2: case 2:
if isValid := validator(splited[1]); isValid { if isValid := validator(split[1]); isValid {
containerPath = splited[0] containerPath = split[0]
mode = splited[1] mode = split[1]
val = fmt.Sprintf("%s:%s", path.Clean(containerPath), mode) val = fmt.Sprintf("%s:%s", path.Clean(containerPath), mode)
} else { } else {
containerPath = splited[1] containerPath = split[1]
val = fmt.Sprintf("%s:%s", splited[0], path.Clean(containerPath)) val = fmt.Sprintf("%s:%s", split[0], path.Clean(containerPath))
} }
case 3: case 3:
containerPath = splited[1] containerPath = split[1]
mode = splited[2] mode = split[2]
if isValid := validator(splited[2]); !isValid { if isValid := validator(split[2]); !isValid {
return val, fmt.Errorf("bad mode specified: %s", mode) return val, fmt.Errorf("bad mode specified: %s", mode)
} }
val = fmt.Sprintf("%s:%s:%s", splited[0], containerPath, mode) val = fmt.Sprintf("%s:%s:%s", split[0], containerPath, mode)
} }
if !path.IsAbs(containerPath) { if !path.IsAbs(containerPath) {