From 2f8dbdcd09396f65610f25b483c8ccd8a52236e6 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Thu, 9 Mar 2023 15:13:22 -0500 Subject: [PATCH 1/2] Remove assignment to variable that gets overriden and never used Signed-off-by: Cleber Rosa Signed-off-by: Monika Kairaityte --- podman_compose.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman_compose.py b/podman_compose.py index 89395fb..8b5577a 100755 --- a/podman_compose.py +++ b/podman_compose.py @@ -2467,7 +2467,7 @@ class PodmanCompose: parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter) self._init_global_parser(parser) subparsers = parser.add_subparsers(title="command", dest="command") - subparser = subparsers.add_parser("help", help="show help") + _ = 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 for cmd_parser in cmd._parse_args: # pylint: disable=protected-access From 1c0c63aaf266020b3c2e39243816650068063778 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Thu, 9 Mar 2023 15:30:36 -0500 Subject: [PATCH 2/2] 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 --- podman_compose.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/podman_compose.py b/podman_compose.py index 8b5577a..f7c2682 100755 --- a/podman_compose.py +++ b/podman_compose.py @@ -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