Merge pull request #7646 from edsantiago/version_options

podman version and --version: fix format, exit
containers · Sep 17, 2020 · c8d90d0 · c8d90d0
2 parents d8414ad + db86ea9
commit c8d90d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
@@ -80,10 +80,6 @@ func init() {
 	)
 
 	rootFlags(rootCmd, registry.PodmanConfig())
-
-	// "version" is a local flag to avoid collisions with sub-commands that use "-v"
-	var dummyVersion bool
-	rootCmd.Flags().BoolVarP(&dummyVersion, "version", "v", false, "Version of Podman")
 }
 
 func Execute() {

diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
@@ -47,12 +47,9 @@ func version(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		_, err = io.WriteString(os.Stdout, s)
+		_, err = io.WriteString(os.Stdout, s+"\n")
 		return err
 	case cmd.Flag("format").Changed:
-		if !strings.HasSuffix(versionFormat, "\n") {
-			versionFormat += "\n"
-		}
 		out := formats.StdoutTemplate{Output: versions, Template: versionFormat}
 		err := out.Out()
 		if err != nil {