Added missing part of b03ecab

cmaglie · cmaglie · commit 0e419c6b16b6 · 2018-06-01T12:03:29.000+02:00
diff --git a/builder_utils/utils.go b/builder_utils/utils.go
@@ -502,10 +502,6 @@ func PrepareCommandForRecipe(ctx *types.Context, buildProperties properties.Map,
 		return nil, i18n.WrapError(err)
 	}
 
-	if ctx.Verbose {
-		logger.UnformattedFprintln(os.Stdout, commandLine)
-	}
-
 	return command, nil
 }
 
diff --git a/utils/utils.go b/utils/utils.go
@@ -303,6 +303,9 @@ const (
 )
 
 func ExecCommand(ctx *types.Context, command *exec.Cmd, stdout int, stderr int) ([]byte, []byte, error) {
+	if ctx.Verbose {
+		ctx.GetLogger().UnformattedFprintln(os.Stdout, PrintableCommand(command.Args))
+	}
 
 	if stdout == Capture {
 		buffer := &bytes.Buffer{}

Original file line number	Diff line number	Diff line change
`@@ -502,10 +502,6 @@ func PrepareCommandForRecipe(ctx *types.Context, buildProperties properties.Map,`
`502`	`502`	`return nil, i18n.WrapError(err)`
`503`	`503`	`}`
`504`	`504`
`505`		`- if ctx.Verbose {`
`506`		`- logger.UnformattedFprintln(os.Stdout, commandLine)`
`507`		`- }`
`508`		`-`
`509`	`505`	`return command, nil`
`510`	`506`	`}`
`511`	`507`
Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,9 @@ const (`
`303`	`303`	`)`
`304`	`304`
`305`	`305`	`func ExecCommand(ctx types.Context, command exec.Cmd, stdout int, stderr int) ([]byte, []byte, error) {`
	`306`	`+ if ctx.Verbose {`
	`307`	`+ ctx.GetLogger().UnformattedFprintln(os.Stdout, PrintableCommand(command.Args))`
	`308`	`+ }`
`306`	`309`
`307`	`310`	`if stdout == Capture {`
`308`	`311`	`buffer := &bytes.Buffer{}`