diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index fd8f322c45..db5c292973 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -72,7 +72,7 @@ func containersConfModules() ([]string, error) { fs.ParseErrorsWhitelist.UnknownFlags = true fs.Usage = func() {} fs.SetInterspersed(false) - fs.StringSliceVar(&modules, "module", nil, "") + fs.StringArrayVar(&modules, "module", nil, "") fs.BoolP("help", "h", false, "") // Need a fake help flag to avoid the `pflag: help requested` error return modules, fs.Parse(os.Args[index:]) } diff --git a/cmd/podman/root.go b/cmd/podman/root.go index bec9bd071e..e8a746a5f4 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -507,7 +507,7 @@ func rootFlags(cmd *cobra.Command, podmanConfig *entities.PodmanConfig) { // as a flag here to a) make sure that rootflags are aware of // this flag and b) to have shell completions. moduleFlagName := "module" - lFlags.StringSlice(moduleFlagName, nil, "Load the containers.conf(5) module") + lFlags.StringArray(moduleFlagName, nil, "Load the containers.conf(5) module") _ = cmd.RegisterFlagCompletionFunc(moduleFlagName, common.AutocompleteContainersConfModules) // A *hidden* flag to change the database backend. diff --git a/test/system/800-config.bats b/test/system/800-config.bats index 588a68f765..13b56a0e92 100644 --- a/test/system/800-config.bats +++ b/test/system/800-config.bats @@ -104,8 +104,8 @@ See 'podman create --help'" "--module must be specified before the command" run_podman rm -f $cid - # Nonexistent module path - nonesuch=${PODMAN_TMPDIR}/nonexistent + # Nonexistent module path with comma + nonesuch=${PODMAN_TMPDIR}/nonexistent,withcomma run_podman 1 --module=$nonesuch sdfsdfdsf is "$output" "Failed to obtain podman configuration: could not resolve module \"$nonesuch\": stat $nonesuch: no such file or directory" \ "--module=ENOENT"