Merge pull request ceph#40124 from adk3798/format-help

pybind/ceph_argparse: print --format flag name in help descs

Reviewed-by: Michael Fritch <[email protected]>

src/pybind/ceph_argparse.py

@@ -830,8 +830,13 @@ def helpstr(self):
         """
         if self.t == CephBool:
             chunk = "--{0}".format(self.name.replace("_", "-"))
-        elif self.t == CephPrefix or self.t == CephChoices:
+        elif self.t == CephPrefix:
             chunk = str(self.instance)
+        elif self.t == CephChoices:
+            if self.name == 'format':
+                chunk = f'--{self.name} {{{str(self.instance)}}}'
+            else:
+                chunk = str(self.instance)
         elif self.t == CephOsdName:
             # it just so happens all CephOsdName commands are named 'id' anyway,
             # so <id|osd.id> is perfect.