From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 8 Aug 2024 15:29:40 +0000 (+0200)
Subject: Fix problem in tramp-container.el
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70f45b584d8386f98b0b42612f0fbd42cada9f89;p=emacs.git

Fix problem in tramp-container.el

* lisp/net/tramp-container.el (tramp-kubernetes--context-namespace):
Handle nil list elements.

(cherry picked from commit 8b662047074f7413c280c9092d1c39763f8b0e5b)
---

diff --git a/lisp/net/tramp-container.el b/lisp/net/tramp-container.el
index 57c34a1b8e4..fd82e4516b8 100644
--- a/lisp/net/tramp-container.el
+++ b/lisp/net/tramp-container.el
@@ -419,10 +419,11 @@ Obey `tramp-kubernetes-context'"
   "The kubectl options for context and namespace as string."
   (mapconcat
    #'identity
-   `(,(when-let ((context (tramp-kubernetes--current-context vec)))
-	(format "--context=%s" context))
-     ,(when-let ((namespace (tramp-kubernetes--namespace vec)))
-	(format "--namespace=%s" namespace)))
+   (delq nil
+	 `(,(when-let ((context (tramp-kubernetes--current-context vec)))
+	      (format "--context=%s" context))
+	   ,(when-let ((namespace (tramp-kubernetes--namespace vec)))
+	      (format "--namespace=%s" namespace))))
    " "))
 
 ;;;###tramp-autoload