emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] master 4a46232: * lisp/net/tramp-sh.el (tramp-get-remote-p


From: Michael Albinus
Subject: [Emacs-diffs] master 4a46232: * lisp/net/tramp-sh.el (tramp-get-remote-perl): Perform a basic check.
Date: Fri, 26 Aug 2016 13:12:59 +0000 (UTC)

branch: master
commit 4a46232d92e7af257e1bccf2958e3362daa976dc
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    * lisp/net/tramp-sh.el (tramp-get-remote-perl): Perform a basic check.
    
    (Bug#22478)
---
 lisp/net/tramp-sh.el |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index bbc74fc..9afa85e 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -5368,16 +5368,20 @@ Nonexistent directories are removed from spec."
     (tramp-message vec 5 "Finding a suitable `perl' command")
     (let ((result
           (or (tramp-find-executable vec "perl5" (tramp-get-remote-path vec))
-              (tramp-find-executable
-               vec "perl" (tramp-get-remote-path vec)))))
+              (tramp-find-executable vec "perl" (tramp-get-remote-path vec)))))
+      ;; Perform a basic check.
+      (and result
+          (null (tramp-send-command-and-check
+                 vec (format "%s -e 'print \"Hello\n\";'" result)))
+          (setq result nil))
       ;; We must check also for some Perl modules.
       (when result
        (with-tramp-connection-property vec "perl-file-spec"
-          (tramp-send-command-and-check
-           vec (format "%s -e 'use File::Spec;'" result)))
+         (tramp-send-command-and-check
+          vec (format "%s -e 'use File::Spec;'" result)))
        (with-tramp-connection-property vec "perl-cwd-realpath"
-          (tramp-send-command-and-check
-           vec (format "%s -e 'use Cwd \"realpath\";'" result))))
+         (tramp-send-command-and-check
+          vec (format "%s -e 'use Cwd \"realpath\";'" result))))
       result)))
 
 (defun tramp-get-remote-stat (vec)



reply via email to

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