From a4bcb6e37d887889ae043ec4d5e39c03972b2147 Mon Sep 17 00:00:00 2001 From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:56:43 -0600 Subject: [PATCH] [release-19.0] Correctly set log_dir default in vtcombo (#15153) (#15155) Signed-off-by: Andrew Mason Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com> --- go/cmd/vtcombo/cli/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/cmd/vtcombo/cli/main.go b/go/cmd/vtcombo/cli/main.go index 72dcd3fa8b9..7b9143f1384 100644 --- a/go/cmd/vtcombo/cli/main.go +++ b/go/cmd/vtcombo/cli/main.go @@ -178,7 +178,7 @@ func run(cmd *cobra.Command, args []string) (err error) { // vtctld UI requires the cell flag cmd.Flags().Set("cell", tpb.Cells[0]) - if cmd.Flags().Lookup("log_dir") == nil { + if f := cmd.Flags().Lookup("log_dir"); f != nil && !f.Changed { cmd.Flags().Set("log_dir", "$VTDATAROOT/tmp") }