File 0001-Low-tools-Fix-the-show-detail-toggle-in-cr... of Package pacemaker.26120

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Low-tools-Fix-the-show-detail-toggle-in-crm_mon.patch of Package pacemaker.26120

From 7f0114fdb9d9ff8f235f58595968c52deb93a2c0 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Tue, 18 Jan 2022 15:19:16 -0500
Subject: [PATCH] Low: tools: Fix the show detail toggle in crm_mon.

With PCMK__COMPAT_2_0 enabled, pcmk_show_failed_detail is always
enabled.  Therefore, do not take it into account when showing whether
the "R" (show detail) toggle is in effect in crm_mon's help screen.
Without this, that toggle is always shown as being in effect.
---
 tools/crm_mon.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/crm_mon.c b/tools/crm_mon.c
index 5b0b04645..95356eefe 100644
--- a/tools/crm_mon.c
+++ b/tools/crm_mon.c
@@ -1155,7 +1155,11 @@ detect_user_input(GIOChannel *channel, GIOCondition condition, gpointer user_dat
         print_option_help(out, 'A', pcmk_is_set(show, pcmk_section_attributes));
         print_option_help(out, 'L', pcmk_is_set(show, pcmk_section_bans));
         print_option_help(out, 'D', !pcmk_is_set(show, pcmk_section_summary));
+#ifdef PCMK__COMPAT_2_0
+        print_option_help(out, 'R', pcmk_any_flags_set(show_opts, pcmk_show_details & ~pcmk_show_failed_detail));
+#else
         print_option_help(out, 'R', pcmk_any_flags_set(show_opts, pcmk_show_details));
+#endif
         print_option_help(out, 'b', pcmk_is_set(show_opts, pcmk_show_brief));
         print_option_help(out, 'j', pcmk_is_set(show_opts, pcmk_show_pending));
         curses_formatted_printf(out, "%d m: \t%s\n", interactive_fence_level, get_option_desc('m'));
-- 
2.34.1

Places

File 0001-Low-tools-Fix-the-show-detail-toggle-in-crm_mon.patch of Package pacemaker.26120

Places