emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 6636a64: Fix error in tramp-archive.el


From: Michael Albinus
Subject: master 6636a64: Fix error in tramp-archive.el
Date: Sat, 19 Jun 2021 12:11:59 -0400 (EDT)

branch: master
commit 6636a644599c95517b3935f831fa0df42cb16bf3
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>

    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.
---
 lisp/net/tramp-archive.el            | 2 ++
 test/lisp/net/tramp-archive-tests.el | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index d2ee729..d723fd5 100644
--- 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 773bc8f..9a97974 100644
--- 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]