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

bump github.com/spf13/cobra from 1.4.0 to 1.5.0

Browse Source 
Update cobra to latest version. Remove workaround for podman -h.
Also regenerate the completion scripts.

[NO NEW TESTS NEEDED]

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-06-21 16:57:49 +02:00
parent c8032b9911
commit 050693b2e7
29 changed files with 972 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/podman/main.go
View File

@@ -1,7 +1,6 @@
package main
import (
"errors"
"fmt"
"os"
@@ -27,7 +26,6 @@ import (
"github.com/containers/storage/pkg/reexec"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
func main() {
@@ -103,13 +101,6 @@ func parseCommands() *cobra.Command {
}
func flagErrorFuncfunc(c *cobra.Command, e error) error {
// cobra compares via == and not errors.Is so we cannot wrap that error.
// This is required to make podman -h work.
// This can be removed once https://github.com/spf13/cobra/pull/1730
// is merged and vendored into podman.
if errors.Is(e, pflag.ErrHelp) {
return e
}
e = fmt.Errorf("%w\nSee '%s --help'", e, c.CommandPath())
return e
}