mirror of
https://github.com/containers/podman-compose.git
synced 2025-04-11 19:18:28 +02:00
Fix handling of --in-pod argument
Currently --in-pod handling is broken because the only way to set False is by providing empty argument like "--in-pod=". As of Python 3.7 the solution is to accept string and parse manually. Co-authored-by: Randolph Sapp <res.sapp@gmail.com> Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
This commit is contained in:
parent
58641f0545
commit
70a0e2d003
@ -346,7 +346,7 @@ def norm_ulimit(inner_value):
|
||||
|
||||
|
||||
def transform(args, project_name, given_containers):
|
||||
if not args.in_pod:
|
||||
if not args.in_pod_bool:
|
||||
pod_name = None
|
||||
pods = []
|
||||
else:
|
||||
@ -1911,6 +1911,13 @@ class PodmanCompose:
|
||||
for cmd_parser in cmd._parse_args: # pylint: disable=protected-access
|
||||
cmd_parser(subparser)
|
||||
self.global_args = parser.parse_args()
|
||||
if self.global_args.in_pod.lower() not in ('', 'true', '1', 'false', '0'):
|
||||
raise ValueError(
|
||||
f'Invalid --in-pod value: \'{self.global_args.in_pod}\'. '
|
||||
'It must be set to either of: empty value, true, 1, false, 0'
|
||||
)
|
||||
self.global_args.in_pod_bool = self.global_args.in_pod.lower() in ('', 'true', '1')
|
||||
|
||||
if self.global_args.version:
|
||||
self.global_args.command = "version"
|
||||
if not self.global_args.command or self.global_args.command == "help":
|
||||
@ -1927,8 +1934,8 @@ class PodmanCompose:
|
||||
"--in-pod",
|
||||
help="pod creation",
|
||||
metavar="in_pod",
|
||||
type=bool,
|
||||
default=True,
|
||||
type=str,
|
||||
default="true",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--pod-args",
|
||||
|
@ -127,7 +127,7 @@ def set_args(podman_compose: PodmanCompose, file_names: list[str]) -> None:
|
||||
podman_compose.global_args.project_name = None
|
||||
podman_compose.global_args.env_file = None
|
||||
podman_compose.global_args.profile = []
|
||||
podman_compose.global_args.in_pod = True
|
||||
podman_compose.global_args.in_pod_bool = True
|
||||
podman_compose.global_args.no_normalize = True
|
||||
|
||||
|
||||
|
@ -99,7 +99,7 @@ def set_args(podman_compose: PodmanCompose, file_names: list[str]) -> None:
|
||||
podman_compose.global_args.project_name = None
|
||||
podman_compose.global_args.env_file = None
|
||||
podman_compose.global_args.profile = []
|
||||
podman_compose.global_args.in_pod = True
|
||||
podman_compose.global_args.in_pod_bool = True
|
||||
podman_compose.global_args.no_normalize = None
|
||||
|
||||
|
||||
|
@ -254,7 +254,7 @@ def set_args(podman_compose: PodmanCompose, file_names: list[str], no_normalize:
|
||||
podman_compose.global_args.project_name = None
|
||||
podman_compose.global_args.env_file = None
|
||||
podman_compose.global_args.profile = []
|
||||
podman_compose.global_args.in_pod = True
|
||||
podman_compose.global_args.in_pod_bool = True
|
||||
podman_compose.global_args.no_normalize = no_normalize
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user