diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-22 12:56:19 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-22 12:56:19 -0400 |
| commit | e41089244b300af2b3e51ac1e9501b4cfe42264e (patch) | |
| tree | 7e55e6dbe5037ca446cea38cf398bcf63e8ba4d5 /cmd/podman | |
| parent | 35567e706b5009ead40c0eaef7c5c1199cd8d448 (diff) | |
| download | podman-e41089244b300af2b3e51ac1e9501b4cfe42264e.tar.gz podman-e41089244b300af2b3e51ac1e9501b4cfe42264e.tar.bz2 podman-e41089244b300af2b3e51ac1e9501b4cfe42264e.zip | |
Attempt to turn on build_without_cgo tests
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/system/service.go | 9 | ||||
| -rw-r--r-- | cmd/podman/system/varlink.go | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index 221738f33..0f42ae28b 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -17,6 +17,7 @@ import ( "github.com/containers/libpod/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "github.com/spf13/pflag" ) var ( @@ -52,6 +53,14 @@ func init() { flags.BoolVar(&srvArgs.Varlink, "varlink", false, "Use legacy varlink service instead of REST") _ = flags.MarkDeprecated("varlink", "valink API is deprecated.") + flags.SetNormalizeFunc(aliasTimeoutFlag) +} + +func aliasTimeoutFlag(_ *pflag.FlagSet, name string) pflag.NormalizedName { + if name == "timeout" { + name = "time" + } + return pflag.NormalizedName(name) } func service(cmd *cobra.Command, args []string) error { diff --git a/cmd/podman/system/varlink.go b/cmd/podman/system/varlink.go index de855eba6..6a38b3d28 100644 --- a/cmd/podman/system/varlink.go +++ b/cmd/podman/system/varlink.go @@ -8,7 +8,6 @@ import ( "github.com/containers/libpod/cmd/podman/registry" "github.com/containers/libpod/pkg/domain/entities" "github.com/spf13/cobra" - "github.com/spf13/pflag" ) var ( @@ -40,13 +39,6 @@ func init() { flags.SetNormalizeFunc(aliasTimeoutFlag) } -func aliasTimeoutFlag(_ *pflag.FlagSet, name string) pflag.NormalizedName { - if name == "timeout" { - name = "time" - } - return pflag.NormalizedName(name) -} - func varlinkE(cmd *cobra.Command, args []string) error { uri := registry.DefaultVarlinkAddress if len(args) > 0 { |