mirror of
https://github.com/containers/podman-compose.git
synced 2025-06-30 12:40:13 +02:00
Fix formatting of description of systemd command
When running "podman-compose", the list of commands gets displayed. The "systemd" command is an outlier, showing multiple lines, unintended at this location. This change moves the longer command description to its proper place, that is, it gets shown when "podman-compose systemd --help" is executed. Signed-off-by: Cleber Rosa <crosa@redhat.com Signed-off-by: Monika Kairaityte <monika@kibit.lt>
This commit is contained in:
committed by
Monika Kairaityte
parent
2f8dbdcd09
commit
1c0c63aaf2
@ -2469,7 +2469,7 @@ class PodmanCompose:
|
||||
subparsers = parser.add_subparsers(title="command", dest="command")
|
||||
_ = subparsers.add_parser("help", help="show help")
|
||||
for cmd_name, cmd in self.commands.items():
|
||||
subparser = subparsers.add_parser(cmd_name, help=cmd.desc) # pylint: disable=protected-access
|
||||
subparser = subparsers.add_parser(cmd_name, help=cmd.help, description=cmd.desc) # pylint: disable=protected-access
|
||||
for cmd_parser in cmd._parse_args: # pylint: disable=protected-access
|
||||
cmd_parser(subparser)
|
||||
self.global_args = parser.parse_args(argv)
|
||||
@ -2604,7 +2604,12 @@ class cmd_run: # pylint: disable=invalid-name,too-few-public-methods
|
||||
raise PodmanComposeError("Command must be async")
|
||||
wrapped._compose = self.compose # type: ignore[attr-defined]
|
||||
# Trim extra indentation at start of multiline docstrings.
|
||||
wrapped.desc = self.cmd_desc or re.sub(r"^\s+", "", func.__doc__ or "") # type: ignore[attr-defined]
|
||||
help_desc = self.cmd_desc or re.sub(r"^\s+", "", func.__doc__ or "") # type: ignore[attr-defined]
|
||||
if "\n" in help_desc:
|
||||
wrapped.help, wrapped.desc = help_desc.split("\n", 1) # type: ignore[attr-defined]
|
||||
else:
|
||||
wrapped.help = help_desc # type: ignore[attr-defined]
|
||||
wrapped.desc = None # type: ignore[attr-defined]
|
||||
wrapped._parse_args = [] # type: ignore[attr-defined]
|
||||
self.compose.commands[self.cmd_name] = wrapped
|
||||
return wrapped
|
||||
|
Reference in New Issue
Block a user