opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-17 11:14:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26984 from Luap99/pflag

Browse Source 
update module github.com/spf13/pflag to v1.0.10
This commit is contained in:
openshift-merge-bot[bot]
2025-09-09 11:27:39 +00:00
committed by GitHub
parent 9dd5fb2c99 c2506656c4
commit 8900d8e77b
9 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/compose.go
View File

@ -254,7 +254,7 @@ func composeMain(cmd *cobra.Command, args []string) error {
// after `podman compose [ARGS]` are passed to the compose provider. // after `podman compose [ARGS]` are passed to the compose provider.
// For now, we only look for the --help flag. // For now, we only look for the --help flag.
fs := pflag.NewFlagSet("args", pflag.ContinueOnError) fs := pflag.NewFlagSet("args", pflag.ContinueOnError)
fs.ParseErrorsWhitelist.UnknownFlags = true fs.ParseErrorsAllowlist.UnknownFlags = true
fs.SetInterspersed(false) fs.SetInterspersed(false)
fs.BoolP("help", "h", false, "") fs.BoolP("help", "h", false, "")
if err := fs.Parse(args); err != nil { if err := fs.Parse(args); err != nil {

2
cmd/podman/registry/config.go
View File

@ -70,7 +70,7 @@ func containersConfModules() ([]string, error) {
var modules []string var modules []string
fs := pflag.NewFlagSet("module", pflag.ContinueOnError) fs := pflag.NewFlagSet("module", pflag.ContinueOnError)
fs.ParseErrorsWhitelist.UnknownFlags = true fs.ParseErrorsAllowlist.UnknownFlags = true
fs.Usage = func() {} fs.Usage = func() {}
fs.SetInterspersed(false) fs.SetInterspersed(false)
fs.StringArrayVar(&modules, "module", nil, "") fs.StringArrayVar(&modules, "module", nil, "")

2
cmd/podman/registry/remote.go
View File

@ -36,7 +36,7 @@ func IsRemote() bool {
remote = true remote = true
} }
fs := pflag.NewFlagSet("remote", pflag.ContinueOnError) fs := pflag.NewFlagSet("remote", pflag.ContinueOnError)
fs.ParseErrorsWhitelist.UnknownFlags = true fs.ParseErrorsAllowlist.UnknownFlags = true
fs.Usage = func() {} fs.Usage = func() {}
fs.SetInterspersed(false) fs.SetInterspersed(false)
fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "") fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "")

2
go.mod
View File

@ -60,7 +60,7 @@ require (
github.com/shirou/gopsutil/v4 v4.25.8 github.com/shirou/gopsutil/v4 v4.25.8
github.com/sirupsen/logrus v1.9.3 github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.10.1 github.com/spf13/cobra v1.10.1
github.com/spf13/pflag v1.0.9 github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1 github.com/stretchr/testify v1.11.1
github.com/vbauerster/mpb/v8 v8.10.2 github.com/vbauerster/mpb/v8 v8.10.2
github.com/vishvananda/netlink v1.3.1 github.com/vishvananda/netlink v1.3.1

3
go.sum
View File

@ -365,8 +365,9 @@ github.com/smallstep/pkcs7 v0.1.1 h1:x+rPdt2W088V9Vkjho4KtoggyktZJlMduZAtRHm68LU
github.com/smallstep/pkcs7 v0.1.1/go.mod h1:dL6j5AIz9GHjVEBTXtW+QliALcgM19RtXaTeyxI+AfA= github.com/smallstep/pkcs7 v0.1.1/go.mod h1:dL6j5AIz9GHjVEBTXtW+QliALcgM19RtXaTeyxI+AfA=
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw= github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw=
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M= github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

2
pkg/systemd/generate/containers.go
View File

@ -358,7 +358,7 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst
remainingCmd := info.CreateCommand[index:] remainingCmd := info.CreateCommand[index:]
// Presence check for certain flags/options. // Presence check for certain flags/options.
fs := pflag.NewFlagSet("args", pflag.ContinueOnError) fs := pflag.NewFlagSet("args", pflag.ContinueOnError)
fs.ParseErrorsWhitelist.UnknownFlags = true fs.ParseErrorsAllowlist.UnknownFlags = true
fs.Usage = func() {} fs.Usage = func() {}
fs.SetInterspersed(false) fs.SetInterspersed(false)
fs.BoolP("detach", "d", false, "") fs.BoolP("detach", "d", false, "")

2
pkg/systemd/generate/pods.go
View File

@ -339,7 +339,7 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions)
// Presence check for certain flags/options. // Presence check for certain flags/options.
fs := pflag.NewFlagSet("args", pflag.ContinueOnError) fs := pflag.NewFlagSet("args", pflag.ContinueOnError)
fs.ParseErrorsWhitelist.UnknownFlags = true fs.ParseErrorsAllowlist.UnknownFlags = true
fs.Usage = func() {} fs.Usage = func() {}
fs.SetInterspersed(false) fs.SetInterspersed(false)
fs.String("name", "", "") fs.String("name", "", "")

14
vendor/github.com/spf13/pflag/flag.go generated vendored
View File

@ -143,8 +143,9 @@ type ParseErrorsAllowlist struct {
UnknownFlags bool UnknownFlags bool
} }
// DEPRECATED: please use ParseErrorsAllowlist instead // ParseErrorsWhitelist defines the parsing errors that can be ignored.
// This type will be removed in a future release //
// Deprecated: use [ParseErrorsAllowlist] instead. This type will be removed in a future release.
type ParseErrorsWhitelist = ParseErrorsAllowlist type ParseErrorsWhitelist = ParseErrorsAllowlist
// NormalizedName is a flag name that has been normalized according to rules // NormalizedName is a flag name that has been normalized according to rules
@ -165,8 +166,9 @@ type FlagSet struct {
// ParseErrorsAllowlist is used to configure an allowlist of errors // ParseErrorsAllowlist is used to configure an allowlist of errors
ParseErrorsAllowlist ParseErrorsAllowlist ParseErrorsAllowlist ParseErrorsAllowlist
// DEPRECATED: please use ParseErrorsAllowlist instead // ParseErrorsAllowlist is used to configure an allowlist of errors.
// This field will be removed in a future release //
// Deprecated: use [FlagSet.ParseErrorsAllowlist] instead. This field will be removed in a future release.
ParseErrorsWhitelist ParseErrorsAllowlist ParseErrorsWhitelist ParseErrorsAllowlist
name string name string
@ -1185,7 +1187,7 @@ func (f *FlagSet) Parse(arguments []string) error {
case ContinueOnError: case ContinueOnError:
return err return err
case ExitOnError: case ExitOnError:
if errors.Is(err, ErrHelp) { if err == ErrHelp {
os.Exit(0) os.Exit(0)
} }
fmt.Fprintln(f.Output(), err) fmt.Fprintln(f.Output(), err)
@ -1214,7 +1216,7 @@ func (f *FlagSet) ParseAll(arguments []string, fn func(flag *Flag, value string)
case ContinueOnError: case ContinueOnError:
return err return err
case ExitOnError: case ExitOnError:
if errors.Is(err, ErrHelp) { if err == ErrHelp {
os.Exit(0) os.Exit(0)
} }
fmt.Fprintln(f.Output(), err) fmt.Fprintln(f.Output(), err)

2
vendor/modules.txt vendored
View File

@ -646,7 +646,7 @@ github.com/smallstep/pkcs7/internal/legacy/x509
# github.com/spf13/cobra v1.10.1 # github.com/spf13/cobra v1.10.1
## explicit; go 1.15 ## explicit; go 1.15
github.com/spf13/cobra github.com/spf13/cobra
# github.com/spf13/pflag v1.0.9 # github.com/spf13/pflag v1.0.10
## explicit; go 1.12 ## explicit; go 1.12
github.com/spf13/pflag github.com/spf13/pflag
# github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 # github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6