diff options
| -rw-r--r-- | cmd/podman/common/completion.go | 6 | ||||
| -rw-r--r-- | cmd/podman/images/save.go | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index f207f6925..492e5bc01 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -25,6 +25,8 @@ var ( ChangeCmds = []string{"CMD", "ENTRYPOINT", "ENV", "EXPOSE", "LABEL", "ONBUILD", "STOPSIGNAL", "USER", "VOLUME", "WORKDIR"} // LogLevels supported by podman LogLevels = []string{"trace", "debug", "info", "warn", "warning", "error", "fatal", "panic"} + // ValidSaveFormats is the list of support podman save formats + ValidSaveFormats = []string{define.OCIManifestDir, define.OCIArchive, define.V2s2ManifestDir, define.V2s2Archive} ) type completeType int @@ -1192,10 +1194,8 @@ func AutocompletePsSort(cmd *cobra.Command, args []string, toComplete string) ([ } // AutocompleteImageSaveFormat - Autocomplete image save format options. -// -> "oci-archive", "oci-dir", "docker-dir" func AutocompleteImageSaveFormat(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { - formats := []string{"oci-archive", "oci-dir", "docker-dir"} - return formats, cobra.ShellCompDirectiveNoFileComp + return ValidSaveFormats, cobra.ShellCompDirectiveNoFileComp } // AutocompleteWaitCondition - Autocomplete wait condition options. diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index fb642bafd..3394c2e99 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -18,7 +18,6 @@ import ( ) var ( - validFormats = []string{define.OCIManifestDir, define.OCIArchive, define.V2s2ManifestDir, define.V2s2Archive} containerConfig = registry.PodmanConfig() ) @@ -38,8 +37,8 @@ var ( if err != nil { return err } - if !util.StringInSlice(format, validFormats) { - return errors.Errorf("format value must be one of %s", strings.Join(validFormats, " ")) + if !util.StringInSlice(format, common.ValidSaveFormats) { + return errors.Errorf("format value must be one of %s", strings.Join(common.ValidSaveFormats, " ")) } return nil }, |