From c2506656c46ce7f893e5c8031c74eb33080704f5 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 4 Sep 2025 14:04:47 +0200 Subject: [PATCH] spf13/pflag: replace deprecated ParseErrorsWhitelist Use ParseErrorsAllowlist instead, should still work the exact same. Signed-off-by: Paul Holzinger --- cmd/podman/compose.go | 2 +- cmd/podman/registry/config.go | 2 +- cmd/podman/registry/remote.go | 2 +- pkg/systemd/generate/containers.go | 2 +- pkg/systemd/generate/pods.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/podman/compose.go b/cmd/podman/compose.go index 3ff6865ece..c6265c9abb 100644 --- a/cmd/podman/compose.go +++ b/cmd/podman/compose.go @@ -254,7 +254,7 @@ func composeMain(cmd *cobra.Command, args []string) error { // after `podman compose [ARGS]` are passed to the compose provider. // For now, we only look for the --help flag. fs := pflag.NewFlagSet("args", pflag.ContinueOnError) - fs.ParseErrorsWhitelist.UnknownFlags = true + fs.ParseErrorsAllowlist.UnknownFlags = true fs.SetInterspersed(false) fs.BoolP("help", "h", false, "") if err := fs.Parse(args); err != nil { diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index d40a1e29ca..f7fc808227 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -70,7 +70,7 @@ func containersConfModules() ([]string, error) { var modules []string fs := pflag.NewFlagSet("module", pflag.ContinueOnError) - fs.ParseErrorsWhitelist.UnknownFlags = true + fs.ParseErrorsAllowlist.UnknownFlags = true fs.Usage = func() {} fs.SetInterspersed(false) fs.StringArrayVar(&modules, "module", nil, "") diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go index 0000722f91..2ff53a038d 100644 --- a/cmd/podman/registry/remote.go +++ b/cmd/podman/registry/remote.go @@ -36,7 +36,7 @@ func IsRemote() bool { remote = true } fs := pflag.NewFlagSet("remote", pflag.ContinueOnError) - fs.ParseErrorsWhitelist.UnknownFlags = true + fs.ParseErrorsAllowlist.UnknownFlags = true fs.Usage = func() {} fs.SetInterspersed(false) fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "") diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index 1990621514..7878f80fb0 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -358,7 +358,7 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst remainingCmd := info.CreateCommand[index:] // Presence check for certain flags/options. fs := pflag.NewFlagSet("args", pflag.ContinueOnError) - fs.ParseErrorsWhitelist.UnknownFlags = true + fs.ParseErrorsAllowlist.UnknownFlags = true fs.Usage = func() {} fs.SetInterspersed(false) fs.BoolP("detach", "d", false, "") diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 3c97973295..81ca410bd8 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -339,7 +339,7 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions) // Presence check for certain flags/options. fs := pflag.NewFlagSet("args", pflag.ContinueOnError) - fs.ParseErrorsWhitelist.UnknownFlags = true + fs.ParseErrorsAllowlist.UnknownFlags = true fs.Usage = func() {} fs.SetInterspersed(false) fs.String("name", "", "")