From 1d93d212541616135da23bcf01ca49180f113e62 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Wed, 15 Apr 2020 10:12:30 -0700 Subject: V2 Enable rootless * Enable running podman V2 rootless * Fixed cobra.PersistentPreRunE usage in all the commands * Leveraged cobra.PersistentPreRunE/cobra.PersistentPostRunE to manage: * rootless * trace (--trace) * profiling (--cpu-profile) * initializing the registry copies of Image/Container engines * Help and Usage templates autoset for all sub-commands Signed-off-by: Jhon Honce --- cmd/podmanV2/networks/network.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'cmd/podmanV2/networks/network.go') diff --git a/cmd/podmanV2/networks/network.go b/cmd/podmanV2/networks/network.go index fc92d2321..85fec545b 100644 --- a/cmd/podmanV2/networks/network.go +++ b/cmd/podmanV2/networks/network.go @@ -9,12 +9,11 @@ import ( var ( // Command: podman _network_ cmd = &cobra.Command{ - Use: "network", - Short: "Manage networks", - Long: "Manage networks", - TraverseChildren: true, - PersistentPreRunE: preRunE, - RunE: registry.SubCommandExists, + Use: "network", + Short: "Manage networks", + Long: "Manage networks", + TraverseChildren: true, + RunE: registry.SubCommandExists, } ) @@ -23,11 +22,4 @@ func init() { Mode: []entities.EngineMode{entities.ABIMode}, Command: cmd, }) - cmd.SetHelpTemplate(registry.HelpTemplate()) - cmd.SetUsageTemplate(registry.UsageTemplate()) -} - -func preRunE(cmd *cobra.Command, args []string) error { - _, err := registry.NewContainerEngine(cmd, args) - return err } -- cgit v1.2.3-54-g00ecf