Dev: ui_context: ignore requirements when option --help is specified

ClusterLabs · Apr 25, 2024 · f4ec6b0 · f4ec6b0
1 parent 11e262d
commit f4ec6b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/crmsh/constants.py b/crmsh/constants.py
@@ -512,5 +512,6 @@
 RSC_ROLE_UNPROMOTED_LEGACY = "Slave"
 PCMK_VERSION_DEFAULT = "2.0.0"
 
-NON_FUNCTIONAL_COMMANDS = ('help', 'cd', 'ls', 'quit', 'up')
+NON_FUNCTIONAL_COMMANDS = {'help', 'cd', 'ls', 'quit', 'up'}
+NON_FUNCTIONAL_OPTIONS = {'--help', '--help-without-redirect'}
 # vim:ts=4:sw=4:et:
diff --git a/crmsh/ui_context.py b/crmsh/ui_context.py
@@ -82,7 +82,8 @@ def run(self, line):
                     cmd = True
                     break
             if cmd:
-                if self.command_name not in constants.NON_FUNCTIONAL_COMMANDS:
+                if self.command_name not in constants.NON_FUNCTIONAL_COMMANDS\
+                        and all(arg not in constants.NON_FUNCTIONAL_OPTIONS for arg in self.command_args):
                     entry = self.current_level()
                     if 'requires' in dir(entry) and not entry.requires():
                         self.fatal_error("Missing requirements")

diff --git a/doc/toolchain/bin/adocxt b/doc/toolchain/bin/adocxt
@@ -13,8 +13,6 @@ RE_SECTION_TITLE = re.compile('^=')
 RE_FROM_CODE_OR_SECTION_TITLE=re.compile(r'^(?:\[\[([^,]+),[^,]*,From Code]]$|=)')
 
 TAG_EXCLUDES = {
-    'cmdhelp_node_online',
-    'cmdhelp_node_standby',
     'cmdhelp_root_report',
 }