From eaacc0e29eea372a21bbf868a57cbcc4cfbe2ce7 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 10:30:16 -0400 Subject: [PATCH] cephadm: ensure entrypoint is assigned a string Ensure that the entrypoint variable is assigned a string. The custom container class can have None and that can confuse future refactoring. The mypy command we're using does not notice this. Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 9a36360bf2d..b47d12f9249 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2832,7 +2832,7 @@ def get_container( privileged = True elif daemon_type == CustomContainer.daemon_type: cc = CustomContainer.init(ctx, ident.fsid, ident.daemon_id) - entrypoint = cc.entrypoint + entrypoint = cc.entrypoint or '' host_network = False envs.extend(cc.get_container_envs()) container_args.extend(cc.get_container_args()) -- 2.39.5