bug#28959: 25.3; Tramp not honoring `tramp-backup-directory-alist'

[Michael Albinus <michael.albinus@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

"Matz, Daniel A. (JSC-EG511)" <daniel.a.matz@nasa.gov> writes:

> Michael,

Hi Daniel,

> I double checked my checkout, and it is recent and includes your commit.
>
> For the tests, 43/58 does indeed pass.  Here’s the summary that prints
> at the end:

This guarantees you have the latest changes. I've added
tramp-test34-find-backup-file-name earlier today, and you have it.

So we need traces. Could you pls apply the appended patch to tramp.el?
Set tramp-verbose to 6, and rerun your test. Hopefully, we'll see what
happens in the Tramp debug buffer, which you'll send to me.

If you fear there are sensible information, you could send the debug
buffer to me directly, w/o Cc.

> Daniel

Best regards, Michael.


[-- Attachment #2: Type: text/plain, Size: 1260 bytes --]

diff --git a/lisp/tramp.el b/lisp/tramp.el
index e300b3a..08a9076 100644
--- a/lisp/tramp.el
+++ b/lisp/tramp.el
@@ -3218,6 +3218,12 @@ User is always nil."
 (defun tramp-handle-find-backup-file-name (filename)
   "Like `find-backup-file-name' for Tramp files."
   (with-parsed-tramp-file-name filename nil
+    (tramp-message
+     v 5 "filename %s backup-enable-predicate %s"
+     filename backup-enable-predicate)
+    (tramp-message
+     v 5 "backup-directory-alist %s tramp-backup-directory-alist %s"
+     backup-directory-alist tramp-backup-directory-alist)
     (let ((backup-directory-alist
 	   (if tramp-backup-directory-alist
 	       (mapcar
@@ -3231,8 +3237,14 @@ User is always nil."
 			method user domain host port (cdr x) hop)
 		     (cdr x))))
 		tramp-backup-directory-alist)
-	     backup-directory-alist)))
-      (tramp-run-real-handler 'find-backup-file-name (list filename)))))
+	     backup-directory-alist))
+	  result)
+      (setq result
+	    (tramp-run-real-handler 'find-backup-file-name (list filename)))
+    (tramp-message
+     v 5 "backup-directory-alist %s result %s"
+     backup-directory-alist result)
+    result)))
 
 (defun tramp-handle-insert-directory
   (filename switches &optional wildcard full-directory-p)