diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-27 16:47:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 16:47:32 -0400 |
| commit | f613a2a8d5778cf088f4d18b69c86b082264a882 (patch) | |
| tree | bf07f589419a0d25d23125eaeb27f04103b49ca1 /cmd/podman/utils/alias.go | |
| parent | dbc13f3dac4fa4095ae5db86085e5711a701eb7b (diff) | |
| parent | 3538815c5b2b4c97304e3ea940cee414b0004d2f (diff) | |
| download | podman-f613a2a8d5778cf088f4d18b69c86b082264a882.tar.gz podman-f613a2a8d5778cf088f4d18b69c86b082264a882.tar.bz2 podman-f613a2a8d5778cf088f4d18b69c86b082264a882.zip | |
Merge pull request #10119 from rhatdan/timeout
Add podman run --timeout option
Diffstat (limited to 'cmd/podman/utils/alias.go')
| -rw-r--r-- | cmd/podman/utils/alias.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cmd/podman/utils/alias.go b/cmd/podman/utils/alias.go index 8d089920b..306e610d9 100644 --- a/cmd/podman/utils/alias.go +++ b/cmd/podman/utils/alias.go @@ -17,8 +17,6 @@ func AliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName { name = "health-timeout" case "net": name = "network" - case "timeout": - name = "time" case "namespace": name = "ns" case "storage": @@ -34,3 +32,12 @@ func AliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName { } return pflag.NormalizedName(name) } + +// TimeoutAliasFlags is a function to handle backwards compatibility with old timeout flags +func TimeoutAliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName { + switch name { + case "timeout": + name = "time" + } + return pflag.NormalizedName(name) +} |