github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cmd: don't alias context package, and use cliContext for cli.Context

Browse Source 
Unfortunately, this is a rather large diff, but perhaps worth a one-time
"rip off the bandaid" for v2. This patch removes the use of "gocontext"
as alias for stdLib's "context", and uses "cliContext" for uses of
cli.context.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-06-20 02:15:13 +02:00
parent 741c4bde51
commit dd0542f7c1
65 changed files with 754 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ctr/commands/version/version.go
View File

@@ -29,9 +29,9 @@ import (
var Command = &cli.Command{
Name: "version",
Usage: "Print the client and server versions",
Action: func(context *cli.Context) error {
if context.NArg() != 0 {
return fmt.Errorf("extra arguments: %v", context.Args())
Action: func(cliContext *cli.Context) error {
if cliContext.NArg() != 0 {
return fmt.Errorf("extra arguments: %v", cliContext.Args())
}
fmt.Println("Client:")
@@ -39,7 +39,7 @@ var Command = &cli.Command{
fmt.Println(" Revision:", version.Revision)
fmt.Println(" Go version:", version.GoVersion)
fmt.Println("")
client, ctx, cancel, err := commands.NewClient(context)
client, ctx, cancel, err := commands.NewClient(cliContext)
if err != nil {
return err
}