Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make Tramp error handling more precise

Browse source 
* lisp/net/tramp-container.el (tramp-actions-copy-out-of-band)
(tramp-container-no-container-regexp): Remove.  Do not register them.
(tramp-distrobox-no-container-regexp): New defcustom.
(tramp-enable-distrobox-method): Add it to
`'tramp-actions-before-shell.  (Bug#71200)
This commit is contained in:
Michael Albinus 2024-05-31 16:27:47 +02:00
parent 319e16550d
commit 0cb511b33b
1 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lisp/net/tramp-container.el
View file

@ -118,20 +118,6 @@
(require 'tramp)
(defvar tramp-actions-before-shell)
(defvar tramp-actions-copy-out-of-band)
;; This does not match all container-based methods. Both in general,
;; the command returns with an error; `tramp-process-alive-regexp'
;; does the check then.
(defcustom tramp-container-no-container-regexp
(rx bol "Error:" (1+ nonl) "no such container" (0+ nonl)
;; Distrobox adds an interactive prompt.
(* "\n" (1+ nonl)))
"Regexp matching missing container message.
The regexp should match at end of buffer."
:group 'tramp
:version "30.1"
:type 'regexp)
;;;###tramp-autoload
(defcustom tramp-docker-program "docker"
@ -252,6 +238,15 @@ This is for out-of-band connections.")
(defconst tramp-nspawn-method "nspawn"
"Tramp method name to connect to systemd-nspawn containers.")
(defcustom tramp-distrobox-no-container-regexp
(rx bol "Error:" (1+ nonl) "no such container" (0+ nonl) "\n"
"Create it now, out of image " (+ (not blank)) "? [Y/n]:" (* blank))
"Regexp matching missing distrobox error message.
The regexp should match at end of buffer."
:group 'tramp
:version "30.1"
:type 'regexp)
;;;###tramp-autoload
(defmacro tramp-skeleton-completion-function (method &rest body)
"Skeleton for `tramp-*-completion-function' with multi-hop support.
@ -635,14 +630,6 @@ see its function help for a description of the format."
`(:application tramp :protocol ,tramp-kubernetes-method)
'tramp-kubernetes-connection-local-default-profile))
(add-to-list
'tramp-actions-before-shell
'(tramp-container-no-container-regexp tramp-action-permission-denied))
(add-to-list
'tramp-actions-copy-out-of-band
'(tramp-container-no-container-regexp tramp-action-permission-denied))
;;;###tramp-autoload
(defun tramp-enable-toolbox-method ()
"Enable connection to Toolbox containers."
@ -682,7 +669,11 @@ see its function help for a description of the format."
(tramp-set-completion-function
tramp-distrobox-method
`((tramp-distrobox--completion-function ,tramp-distrobox-method))))
`((tramp-distrobox--completion-function ,tramp-distrobox-method)))
(add-to-list
'tramp-actions-before-shell
'(tramp-distrobox-no-container-regexp tramp-action-permission-denied)))
;;;###tramp-autoload
(defun tramp-enable-flatpak-method ()