diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-30 20:01:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 20:01:55 +0200 |
| commit | 6900517f109d78ed5a9b794666b7d97782cf6ce9 (patch) | |
| tree | 05e08e081bd03d23943dd255fabdcafe8b83147d /cmd/podman/system/version.go | |
| parent | fc9451ed15e3ea2fbdcd5754b367db74eec1063e (diff) | |
| parent | 22d5b2e3053ad66ce3b30eba3adfca70bc8e389d (diff) | |
| download | podman-6900517f109d78ed5a9b794666b7d97782cf6ce9.tar.gz podman-6900517f109d78ed5a9b794666b7d97782cf6ce9.tar.bz2 podman-6900517f109d78ed5a9b794666b7d97782cf6ce9.zip | |
Merge pull request #6046 from jwhonce/jira/822
V2 enable ps tests
Diffstat (limited to 'cmd/podman/system/version.go')
| -rw-r--r-- | cmd/podman/system/version.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go index b0f4eb528..065eef309 100644 --- a/cmd/podman/system/version.go +++ b/cmd/podman/system/version.go @@ -9,8 +9,8 @@ import ( "time" "github.com/containers/buildah/pkg/formats" - "github.com/containers/libpod/cmd/podman/common" "github.com/containers/libpod/cmd/podman/registry" + "github.com/containers/libpod/cmd/podman/validate" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/domain/entities" "github.com/pkg/errors" @@ -20,7 +20,7 @@ import ( var ( versionCommand = &cobra.Command{ Use: "version", - Args: common.NoArgs, + Args: validate.NoArgs, Short: "Display the Podman Version Information", RunE: version, Annotations: map[string]string{ @@ -56,14 +56,14 @@ func version(cmd *cobra.Command, args []string) error { // TODO we need to discuss how to implement // this more. current endpoints dont have a // version endpoint. maybe we use info? - //if remote { + // if remote { // v.Server, err = getRemoteVersion(c) // if err != nil { // return err // } - //} else { + // } else { v.Server = v.Client - //} + // } versionOutputFormat := versionFormat if versionOutputFormat != "" { |