Fix error in tramp-archive.el

* lisp/net/tramp-archive.el (tramp-archive-file-name-handler):
Archive must exist.  (Bug#49030, Bug#49043)

* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test06-directory-file-name): Tag it :unstable temporarily.

diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index d2ee7299bee1db9bf512f502b9b82faaeb2b43e7..d723fd5c6d5cdf7e0fed9dfa9a437cd65a1db4f5 100644 (file)
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -328,6 +328,8 @@ arguments to pass to the OPERATION."
         ;; `filename' could be a quoted file name.  Or the file
         ;; archive could be a directory, see Bug#30293.
         (if (or (null archive)
+                (not (tramp-archive-run-real-handler
+                      #'file-exists-p (list archive)))
                (tramp-archive-run-real-handler
                  #'file-directory-p (list archive)))
             (tramp-archive-run-real-handler operation args)

diff --git a/test/lisp/net/tramp-archive-tests.el b/test/lisp/net/tramp-archive-tests.el
index 773bc8f45948343efd88c4a988609d8f84a47b21..9a97974c936f3342605253a27377a44f8c00c9ba 100644 (file)
--- a/test/lisp/net/tramp-archive-tests.el
+++ b/test/lisp/net/tramp-archive-tests.el
@@ -321,6 +321,7 @@ They shall still be supported"
   "Check `directory-file-name'.
 This checks also `file-name-as-directory', `file-name-directory',
 `file-name-nondirectory' and `unhandled-file-name-directory'."
+  :tags '(:unstable) ;; Temporarily.
   (skip-unless tramp-archive-enabled)
 
   (should