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

Reorder code slightly in setupWorkingDirectory

Browse source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-11-03 14:33:31 -08:00
parent beeec6d103
commit bb66c16871
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/container_unix.go
View file

@ -1105,7 +1105,9 @@ func (container *Container) getIpcContainer() (*Container, error) {
} }
func (container *Container) setupWorkingDirectory() error { func (container *Container) setupWorkingDirectory() error {
if container.Config.WorkingDir != "" { if container.Config.WorkingDir == "" {
return nil
}
container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir) container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir)
pth, err := container.GetResourcePath(container.Config.WorkingDir) pth, err := container.GetResourcePath(container.Config.WorkingDir)
@ -1126,7 +1128,6 @@ func (container *Container) setupWorkingDirectory() error {
if pthInfo != nil && !pthInfo.IsDir() { if pthInfo != nil && !pthInfo.IsDir() {
return derr.ErrorCodeNotADir.WithArgs(container.Config.WorkingDir) return derr.ErrorCodeNotADir.WithArgs(container.Config.WorkingDir)
} }
}
return nil return nil
} }