From 10af8c58635ebc87fe1924e48bef47112ddbd96a Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 30 Jun 2019 11:23:06 +0200 Subject: [PATCH] Release Tramp 2.4.2 * lisp/net/tramp.el: Bump version. * test/lisp/net/tramp-tests.el (tramp--test-instrument-test-case): Add `add-name-to-file' error message. (tramp--test-ignore-add-name-to-file-error): Make error handler more explicit about the error. --- lisp/net/tramp.el | 2 +- test/lisp/net/tramp-tests.el | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 90f7491bf51..b3a8b93e2a8 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -7,7 +7,7 @@ ;; Maintainer: Michael Albinus ;; Keywords: comm, processes ;; Package: tramp -;; Version: 2.4.2-pre +;; Version: 2.4.2 ;; Package-Requires: ((emacs "24.4")) ;; URL: https://savannah.gnu.org/projects/tramp diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index afe6488ea71..77b2c263ff8 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -168,7 +168,10 @@ properly. BODY shall not contain a timeout." `(let ((tramp-verbose (max (or ,verbose 0) (or tramp-verbose 0))) (tramp-message-show-message t) (debug-ignored-errors - (cons "^make-symbolic-link not supported$" debug-ignored-errors)) + (append + '("^make-symbolic-link not supported$" + "^error with add-name-to-file") + debug-ignored-errors)) inhibit-message) (unwind-protect (let ((tramp--test-instrument-test-case-p t)) ,@body) @@ -3162,10 +3165,9 @@ This tests also `file-executable-p', `file-writable-p' and `set-file-modes'." (declare (indent defun) (debug (body))) `(condition-case err (progn ,@body) - ((error quit debug) - (unless (and (eq (car err) 'file-error) - (string-match "^error with add-name-to-file" - (error-message-string err))) + (file-error + (unless (string-match "^error with add-name-to-file" + (error-message-string err)) (signal (car err) (cdr err)))))) (ert-deftest tramp-test21-file-links () -- 2.39.2