From 7337292531157cfe49cbe5b99aa4284dd3714fe4 Mon Sep 17 00:00:00 2001 From: nicholasyang Date: Wed, 10 Jul 2024 11:53:06 +0800 Subject: [PATCH] Revert changes to `quit` and `up` in ui_context from #1300 (#1466) --- crmsh/ui_context.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crmsh/ui_context.py b/crmsh/ui_context.py index 0b66e79e4..7da604d76 100644 --- a/crmsh/ui_context.py +++ b/crmsh/ui_context.py @@ -326,8 +326,7 @@ def up(self): ''' ok = True if len(self.stack) > 1: - if ServiceManager().service_is_active("pacemaker.service"): - ok = self.current_level().end_game(no_questions_asked=self._in_transit) is not False + ok = self.current_level().end_game(no_questions_asked=self._in_transit) is not False self.stack.pop() self.clear_readline_cache() return ok @@ -348,9 +347,7 @@ def quit(self, rc=0): ''' Exit from the top level ''' - ok = True - if self.command_name and self.command_name not in constants.NON_FUNCTIONAL_COMMANDS: - ok = self.current_level().end_game() + ok = self.current_level().end_game() if options.interactive and not options.batch: if constants.need_reset: utils.ext_cmd("reset")