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

Don't use ansi even when deprecated option is requested
This commit is contained in:
Milas Bowman 2022-06-16 17:15:19 -04:00 committed by GitHub
commit ab25aabfb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -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"`) return errors.New(`cannot specify DEPRECATED "--no-ansi" and "--ansi". Please use only "--ansi"`)
} }
ansi = "never" 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 { if verbose {
logrus.SetLevel(logrus.TraceLevel) logrus.SetLevel(logrus.TraceLevel)