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

6
cmd/ctr/commands/oci/oci.go
View File

@@ -45,12 +45,12 @@ var defaultSpecCommand = &cli.Command{
Usage: "Platform of the spec to print (Examples: 'linux/arm64', 'windows/amd64')",
},
},
Action: func(context *cli.Context) error {
ctx, cancel := commands.AppContext(context)
Action: func(cliContext *cli.Context) error {
ctx, cancel := commands.AppContext(cliContext)
defer cancel()
platform := platforms.DefaultString()
if plat := context.String("platform"); plat != "" {
if plat := cliContext.String("platform"); plat != "" {
platform = plat
}