[Emacs-diffs] trunk r115017: * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):

[Michael Albinus]

------------------------------------------------------------
revno: 115017
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2013-11-07 12:13:41 +0100
message:
  * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):
  Instrument, in order to hunt failure on hydra.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-07 04:38:00 +0000
+++ b/lisp/ChangeLog    2013-11-07 11:13:41 +0000
@@ -1,3 +1,8 @@
+2013-11-07  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):
+       Instrument, in order to hunt failure on hydra.
+
 2013-11-05  Nathan Trapuzzano  <address@hidden>  (tiny change)
 
        * emacs-lisp/cl-macs.el (cl-symbol-macrolet): Print warning for

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-11-05 14:18:41 +0000
+++ b/lisp/net/tramp-sh.el      2013-11-07 11:13:41 +0000
@@ -3576,6 +3576,12 @@
 I.e., for each directory in `tramp-remote-path', it is tested
 whether it exists and if so, it is added to the environment
 variable PATH."
+  (when (featurep 'ert)
+    (ignore-errors
+      (with-demoted-errors
+         (message
+          "tramp-set-remote-path:\n%s\n"
+          (tramp-send-command-and-read vec "echo PATH=$PATH")))))
   (tramp-message vec 5 "Setting $PATH environment variable")
   (tramp-send-command
    vec (format "PATH=%s; export PATH"
@@ -4831,7 +4837,23 @@
        remote-path)))))
 
 (defun tramp-get-ls-command (vec)
-  (with-tramp-connection-property vec "ls"
+;  (with-tramp-connection-property vec "ls"
+    (when (featurep 'ert)
+      (ignore-errors
+       (with-demoted-errors
+         (message
+          "tramp-get-ls-command printenv:\n%s\n"
+          (tramp-send-command-and-read
+           vec "echo \"\\\"`(printenv | sort) || exit`\\\"\"")))
+       (with-demoted-errors
+         (message
+          "tramp-get-ls-command getconf PATH:\n%s\n"
+          (tramp-send-command-and-read
+           vec "echo \\\"`getconf PATH 2>/dev/null || exit`\\\"")))
+       (with-demoted-errors
+         (message
+          "tramp-get-ls-command whereis ls:\n%s\n"
+          (tramp-send-command-and-read vec "echo \"\\\"`whereis ls || 
exit`\\\"\"")))))
     (tramp-message vec 5 "Finding a suitable `ls' command")
     (or
      (catch 'ls-found
@@ -4853,7 +4875,7 @@
                 (setq result (concat result " --color=never")))
               (throw 'ls-found result))
             (setq dl (cdr dl))))))
-     (tramp-error vec 'file-error "Couldn't find a proper `ls' command"))))
+     (tramp-error vec 'file-error "Couldn't find a proper `ls' command")));)
 
 (defun tramp-get-ls-command-with-dired (vec)
   (save-match-data