Merge pull request #5984 from thaJeztah/fix_prune_cancel_errormessage

thaJeztah · web-flow · commit 2c3cf8db0f1f · 2025-04-04T18:18:46.000+02:00
cli/command/network: fix error-message for cancelled prune
diff --git a/cli/command/network/prune.go b/cli/command/network/prune.go
@@ -57,7 +57,7 @@ func runPrune(ctx context.Context, dockerCli command.Cli, options pruneOptions)
 			return "", err
 		}
 		if !r {
-			return "", errdefs.Cancelled(errors.New("network prune cancelled has been cancelled"))
+			return "", errdefs.Cancelled(errors.New("network prune has been cancelled"))
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func runPrune(ctx context.Context, dockerCli command.Cli, options pruneOptions)`
`57`	`57`	`return "", err`
`58`	`58`	`}`
`59`	`59`	`if !r {`
`60`		`- return "", errdefs.Cancelled(errors.New("network prune cancelled has been cancelled"))`
	`60`	`+ return "", errdefs.Cancelled(errors.New("network prune has been cancelled"))`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`