diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-29 20:50:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 20:50:43 +0200 |
| commit | 99f8cfc2dc39b11cd315062167f1ffaf85eda946 (patch) | |
| tree | ef78553ea144e1e872693714ff7f5fb4803162bf /cmd/podman/root.go | |
| parent | a2127efbf8fe0d1b3de577ddc83fa3c6be7629fd (diff) | |
| parent | 6a586992c117bd34c69ca6747ac0c0f101c6ea89 (diff) | |
| download | podman-99f8cfc2dc39b11cd315062167f1ffaf85eda946.tar.gz podman-99f8cfc2dc39b11cd315062167f1ffaf85eda946.tar.bz2 podman-99f8cfc2dc39b11cd315062167f1ffaf85eda946.zip | |
Merge pull request #5956 from jwhonce/wip/version
V2 restore podman -v command
Diffstat (limited to 'cmd/podman/root.go')
| -rw-r--r-- | cmd/podman/root.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 292c69521..8baed42cf 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -78,6 +78,10 @@ func init() { ) rootFlags(registry.PodmanConfig(), rootCmd.PersistentFlags()) + + // "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() { @@ -206,11 +210,6 @@ func rootFlags(opts *entities.PodmanConfig, flags *pflag.FlagSet) { flags.StringVarP(&opts.Uri, "remote", "r", "", "URL to access Podman service") flags.StringSliceVar(&opts.Identities, "identity", []string{}, "path to SSH identity file") - // Override default --help information of `--version` global flag - // TODO: restore -v option for version without breaking -v for volumes - var dummyVersion bool - flags.BoolVar(&dummyVersion, "version", false, "Version of Podman") - cfg := opts.Config flags.StringVar(&cfg.Engine.CgroupManager, "cgroup-manager", cfg.Engine.CgroupManager, opts.CGroupUsage) flags.StringVar(&opts.CpuProfile, "cpu-profile", "", "Path for the cpu profiling results") |