Don't setup the Image/ContainerEngine when calling a cmd with subcmds

There is no need to setup the image and container engine when calling
a command with subcommands since we only print a usage message.
e.g `podman`,`podman container`

This also allows the remote client to show the usage message on
these commands without a running endpoint. I added a test for this.

Signed-off-by: Paul Holzinger <paul.holzinger@web.de>

1 files changed, 4 insertions, 4 deletions

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