Merge pull request #6612 from grondo/color-eventlog

flux-job: do not override `-L, --color` when `-H, --human` is used in `eventlog` and `wait-event` subcommands
flux-framework · Feb 6, 2025 · 34a392f · 34a392f
2 parents 496a332 + 3a175c2
commit 34a392f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/cmd/job/eventlog.c b/src/cmd/job/eventlog.c
@@ -146,7 +146,6 @@ static void formatter_parse_options (optparse_t *p,
     if (optparse_hasopt (p, "human")) {
         format = "text",
         time_format = "human";
-        when = "auto";
     }
 
     if (eventlog_formatter_set_format (evf, format) < 0)

diff --git a/t/t2230-job-info-lookup.t b/t/t2230-job-info-lookup.t
@@ -282,7 +282,7 @@ test_expect_success 'flux job eventlog/wait-event reject invalid --color' '
         test_must_fail flux job eventlog --color=foo $jobid &&
         test_must_fail flux job wait-event --color=foo $jobid
 '
-for opt in "-L" "-Lalways" "--color" "--color=always"; do
+for opt in "-HL" "-L" "-Lalways" "--color" "--color=always"; do
         test_expect_success "flux job eventlog $opt forces color on" '
                 name=notty${opt##--color=} &&
                 outfile=color-${name:-default}.out &&