Merge pull request docker#9311 from quite/no-ansi-be-kind

milas · web-flow · commit ab25aabfb928 · 2022-06-16T17:15:19.000-04:00
Don't use ansi even when deprecated option is requested
diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go
@@ -277,7 +277,7 @@ func RootCommand(dockerCli command.Cli, backend api.Service) *cobra.Command {
 					return errors.New(`cannot specify DEPRECATED "--no-ansi" and "--ansi". Please use only "--ansi"`)
 				}
 				ansi = "never"
-				fmt.Fprint(os.Stderr, aec.Apply("option '--no-ansi' is DEPRECATED ! Please use '--ansi' instead.\n", aec.RedF))
+				fmt.Fprint(os.Stderr, "option '--no-ansi' is DEPRECATED ! Please use '--ansi' instead.\n")
 			}
 			if verbose {
 				logrus.SetLevel(logrus.TraceLevel)

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ func RootCommand(dockerCli command.Cli, backend api.Service) *cobra.Command {`
`277`	`277`	return errors.New(`cannot specify DEPRECATED "--no-ansi" and "--ansi". Please use only "--ansi"`)
`278`	`278`	`}`
`279`	`279`	`ansi = "never"`
`280`		`- fmt.Fprint(os.Stderr, aec.Apply("option '--no-ansi' is DEPRECATED ! Please use '--ansi' instead.\n", aec.RedF))`
	`280`	`+ fmt.Fprint(os.Stderr, "option '--no-ansi' is DEPRECATED ! Please use '--ansi' instead.\n")`
`281`	`281`	`}`
`282`	`282`	`if verbose {`
`283`	`283`	`logrus.SetLevel(logrus.TraceLevel)`