opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7564 from Luap99/remote-subcmds-usage

Browse Source 
Don't setup the Image/ContainerEngine when calling a cmd with subcmds
This commit is contained in:
OpenShift Merge Robot
2020-09-08 17:21:55 -04:00
committed by GitHub
parent e180de8b3c ea71f613e6
commit 814784c5e6
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/podman/root.go
View File

@ -104,8 +104,8 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
// TODO: Remove trace statement in podman V2.1 // TODO: Remove trace statement in podman V2.1
logrus.Debugf("Called %s.PersistentPreRunE(%s)", cmd.Name(), strings.Join(os.Args, " ")) logrus.Debugf("Called %s.PersistentPreRunE(%s)", cmd.Name(), strings.Join(os.Args, " "))
// Help is a special case, no need for more setup // Help and commands with subcommands are special cases, no need for more setup
if cmd.Name() == "help" { if cmd.Name() == "help" || cmd.HasSubCommands() {
return nil return nil
} }
@ -204,8 +204,8 @@ func persistentPostRunE(cmd *cobra.Command, args []string) error {
// TODO: Remove trace statement in podman V2.1 // TODO: Remove trace statement in podman V2.1
logrus.Debugf("Called %s.PersistentPostRunE(%s)", cmd.Name(), strings.Join(os.Args, " ")) logrus.Debugf("Called %s.PersistentPostRunE(%s)", cmd.Name(), strings.Join(os.Args, " "))
// Help is a special case, no need for more cleanup // Help and commands with subcommands are special cases, no need for more cleanup
if cmd.Name() == "help" { if cmd.Name() == "help" || cmd.HasSubCommands() {
return nil return nil
} }

11
test/system/001-basic.bats
View File

@ -69,6 +69,17 @@ function setup() {
is "$output" "Error: unknown flag: --remote" "podman version --remote" is "$output" "Error: unknown flag: --remote" "podman version --remote"
} }
# Check that just calling "podman-remote" prints the usage message even
# without a running endpoint. Use "podman --remote" for this as this works the same.
@test "podman-remote: check for command usage message without a running endpoint" {
if is_remote; then
skip "only applicable on a local run since this requires no endpoint"
fi
run_podman 125 --remote
is "$output" "Error: missing command 'podman COMMAND'" "podman remote show usage message without running endpoint"
}
# This is for development only; it's intended to make sure our timeout # This is for development only; it's intended to make sure our timeout
# in run_podman continues to work. This test should never run in production # in run_podman continues to work. This test should never run in production
# because it will, by definition, fail. # because it will, by definition, fail.