Bug#1109786: unblock: crmsh/5.0.0~rc2-1 (2/4)
From
Valentin Vidic@21:1/5 to
All on Wed Jul 23 22:00:01 2025
[continued from previous message]
- if is118:
- return _patterns_118
- else:
- return _patterns_old
diff -Nru crmsh-5.0.0~rc1/crmsh/log.py crmsh-5.0.0~rc2/crmsh/log.py
--- crmsh-5.0.0~rc1/crmsh/log.py 2025-05-22 11:11:04.000000000 +0200
+++ crmsh-5.0.0~rc2/crmsh/log.py 2025-07-15 07:03:56.000000000 +0200
@@ -431,8 +431,9 @@
"""
while True:
ans = self.wait_input("{} (y/n)? ".format(msg.strip("? ")))
- if ans:
- return ans.lower() == "y"
+ if not ans or ans.lower() not in ('y', 'n'):
+ continue
+ return ans.lower() == 'y'
def syntax_err(self, s, token='', context='', msg=''):
err = "syntax"
diff -Nru crmsh-5.0.0~rc1/crmsh/migration.py crmsh-5.0.0~rc2/crmsh/migration.py --- crmsh-5.0.0~rc1/crmsh/migration.py 2025-05-22 11:11:04.000000000 +0200
+++ crmsh-5.0.0~rc2/crmsh/migration.py 2025-07-15 07:03:56.000000000 +0200
@@ -156,9 +156,12 @@
return ret
-def migrate():
+def migrate(args: typing.Sequence[str]):
+ parser = argparse.ArgumentParser(args[0])
+ parser.add_argument('--local', action='store_true')
+ parsed_args = parser.p