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

Merge pull request #7646 from edsantiago/version_options 

podman version and --version: fix format, exit
This commit is contained in:
OpenShift Merge Robot 2020-09-17 09:40:10 -04:00 committed by GitHub
parent d8414add00 db86ea9bca
commit c8d90d00c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/root.go
View File

@ -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() {

5
cmd/podman/system/version.go
View File

@ -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 {