Skip to content

Fix: ui_context: enter_level() should not check requirements for non-functional subcommands #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Fix: ui_context: enter_level() should not check requirements for non-functional subcommands #1498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions crmsh/ui_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
logger = log.setup_logger(__name__)
logger_utils = log.LoggerUtils(logger)

_NON_FUNCTIONAL_COMMANDS = {'help', 'cd', 'ls', 'quit', 'up'}
_NON_FUNCTIONAL_COMMANDS = {'help', 'ls'}
_NON_FUNCTIONAL_OPTIONS = {'--help', '--help-without-redirect'}

class Context(object):
Expand Down Expand Up @@ -257,8 +257,10 @@ def enter_level(self, level):
self._in_transit = True

entry = level()
if 'requires' in dir(entry) and not entry.requires():
self.fatal_error("Missing requirements")
if self.command_name not in _NON_FUNCTIONAL_COMMANDS \
and all(arg not in _NON_FUNCTIONAL_OPTIONS for arg in self.command_args):
if 'requires' in dir(entry) and not entry.requires():
self.fatal_error("Missing requirements")
self.stack.append(entry)
self.clear_readline_cache()

Expand Down