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

cmd/run: Style fixes 

Fallout from 4536e2c8c2

https://github.com/containers/toolbox/pull/872
This commit is contained in:
Debarshi Ray 2021-09-09 18:41:26 +02:00
parent 26ae0bb896
commit 208d553cec
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/run.go
View File

@ -322,11 +322,9 @@ func runCommandWithFallbacks(container string, command []string, emitEscapeSeque
} }
return nil return nil
case 125: case 125:
err = fmt.Errorf("failed to invoke 'podman exec' in container %s", container) return fmt.Errorf("failed to invoke 'podman exec' in container %s", container)
return err
case 126: case 126:
err = fmt.Errorf("failed to invoke command %s in container %s", command[0], container) return fmt.Errorf("failed to invoke command %s in container %s", command[0], container)
return err
case 127: case 127:
if pathPresent, _ := isPathPresent(container, workDir); !pathPresent { if pathPresent, _ := isPathPresent(container, workDir); !pathPresent {
if runFallbackWorkDirsIndex < len(runFallbackWorkDirs) { if runFallbackWorkDirsIndex < len(runFallbackWorkDirs) {
@ -343,8 +341,7 @@ func runCommandWithFallbacks(container string, command []string, emitEscapeSeque
fmt.Fprintf(os.Stderr, "Using %s instead.\n", workDir) fmt.Fprintf(os.Stderr, "Using %s instead.\n", workDir)
runFallbackWorkDirsIndex++ runFallbackWorkDirsIndex++
} else { } else {
err = fmt.Errorf("directory %s not found in container %s", workDir, container) return fmt.Errorf("directory %s not found in container %s", workDir, container)
return err
} }
} else { } else {
if fallbackToBash && runFallbackCommandsIndex < len(runFallbackCommands) { if fallbackToBash && runFallbackCommandsIndex < len(runFallbackCommands) {
@ -358,8 +355,7 @@ func runCommandWithFallbacks(container string, command []string, emitEscapeSeque
runFallbackCommandsIndex++ runFallbackCommandsIndex++
} else { } else {
err = fmt.Errorf("command %s not found in container %s", command[0], container) return fmt.Errorf("command %s not found in container %s", command[0], container)
return err
} }
} }
default: default: