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

cmd/run: Re-align 

The lines were getting too wide to fit within a vertical 1080x1920
display.  Therefore, restrict them to 120 characters per line.

Fallout from f8e21a31b3

https://github.com/containers/toolbox/pull/1534
This commit is contained in:
Debarshi Ray 2024-09-09 18:22:13 +02:00
parent ca8e62ecf2
commit 3ad77e6b2d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cmd/run.go
View File

@ -412,9 +412,11 @@ func runCommandWithFallbacks(container string,
}
return nil
case 125:
return &exitError{exitCode, fmt.Errorf("failed to invoke 'podman exec' in container %s", container)}
errMsg := fmt.Sprintf("failed to invoke 'podman exec' in container %s", container)
return &exitError{exitCode, errors.New(errMsg)}
case 126:
return &exitError{exitCode, fmt.Errorf("failed to invoke command %s in container %s", command[0], container)}
errMsg := fmt.Sprintf("failed to invoke command %s in container %s", command[0], container)
return &exitError{exitCode, errors.New(errMsg)}
case 127:
if pathPresent, _ := isPathPresent(container, workDir); !pathPresent {
if runFallbackWorkDirsIndex < len(runFallbackWorkDirs) {
@ -431,7 +433,10 @@ func runCommandWithFallbacks(container string,
fmt.Fprintf(os.Stderr, "Using %s instead.\n", workDir)
runFallbackWorkDirsIndex++
} else {
return &exitError{exitCode, fmt.Errorf("directory %s not found in container %s", workDir, container)}
errMsg := fmt.Sprintf("directory %s not found in container %s",
workDir,
container)
return &exitError{exitCode, errors.New(errMsg)}
}
} else if _, err := isCommandPresent(container, command[0]); err != nil {
if fallbackToBash && runFallbackCommandsIndex < len(runFallbackCommands) {
@ -445,7 +450,10 @@ func runCommandWithFallbacks(container string,
runFallbackCommandsIndex++
} else {
return &exitError{exitCode, fmt.Errorf("command %s not found in container %s", command[0], container)}
errMsg := fmt.Sprintf("command %s not found in container %s",
command[0],
container)
return &exitError{exitCode, errors.New(errMsg)}
}
} else {
return nil