mirror of
https://github.com/docker/compose.git
synced 2025-07-23 21:54:40 +02:00
Fix \n not being rendered with backquotes
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
parent
ffe309f595
commit
584ceab72a
@ -111,7 +111,7 @@ func Command(contextType string) *cobra.Command {
|
|||||||
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
|
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
|
||||||
if noAnsi {
|
if noAnsi {
|
||||||
if ansi != "auto" {
|
if ansi != "auto" {
|
||||||
return errors.New(aec.Apply(`cannot specify DEPRECATED "--no-ansi" and "--ansi". Please use only "--ansi".`, aec.RedF))
|
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, aec.Apply("option '--no-ansi' is DEPRECATED ! Please use '--ansi' instead.\n", aec.RedF))
|
||||||
@ -119,7 +119,7 @@ func Command(contextType string) *cobra.Command {
|
|||||||
formatter.SetANSIMode(ansi)
|
formatter.SetANSIMode(ansi)
|
||||||
if opts.WorkDir != "" {
|
if opts.WorkDir != "" {
|
||||||
if opts.ProjectDir != "" {
|
if opts.ProjectDir != "" {
|
||||||
return errors.New(aec.Apply(`cannot specify DEPRECATED "--workdir" and "--project-directory". Please use only "--project-directory" instead.`, aec.RedF))
|
return errors.New(`cannot specify DEPRECATED "--workdir" and "--project-directory". Please use only "--project-directory" instead`)
|
||||||
}
|
}
|
||||||
opts.ProjectDir = opts.WorkDir
|
opts.ProjectDir = opts.WorkDir
|
||||||
fmt.Fprint(os.Stderr, aec.Apply("option '--workdir' is DEPRECATED at root level! Please use '--project-directory' instead.\n", aec.RedF))
|
fmt.Fprint(os.Stderr, aec.Apply("option '--workdir' is DEPRECATED at root level! Please use '--project-directory' instead.\n", aec.RedF))
|
||||||
|
@ -47,7 +47,7 @@ func pullCommand(p *projectOptions) *cobra.Command {
|
|||||||
Short: "Pull service images",
|
Short: "Pull service images",
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
if opts.noParallel {
|
if opts.noParallel {
|
||||||
fmt.Fprint(os.Stderr, aec.Apply(`option "--no-parallel" is DEPRECATED and will be ignored.\n`, aec.RedF))
|
fmt.Fprint(os.Stderr, aec.Apply("option '--no-parallel' is DEPRECATED and will be ignored.\n", aec.RedF))
|
||||||
}
|
}
|
||||||
return runPull(cmd.Context(), opts, args)
|
return runPull(cmd.Context(), opts, args)
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user