[Emacs-diffs] /srv/bzr/emacs/trunk r104488: * net/tramp-sh.el (tramp-find-shell): Apply workaround also for

[Michael Albinus]

------------------------------------------------------------
revno: 104488
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2011-06-04 16:11:26 +0200
message:
  * net/tramp-sh.el (tramp-find-shell): Apply workaround also for
  "SunOS 5.10".
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-04 13:58:37 +0000
+++ b/lisp/ChangeLog    2011-06-04 14:11:26 +0000
@@ -1,5 +1,10 @@
 2011-06-04  Michael Albinus  <address@hidden>
 
+       * net/tramp-sh.el (tramp-find-shell): Apply workaround also for
+       "SunOS 5.10".
+
+2011-06-04  Michael Albinus  <address@hidden>
+
        * net/tramp.el (tramp-set-completion-function, tramp-parse-rhosts)
        (tramp-parse-shosts, tramp-parse-sconfig, tramp-parse-shostkeys)
        (tramp-parse-hosts, tramp-parse-passwd, tramp-parse-netrc)

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2011-06-04 13:58:37 +0000
+++ b/lisp/net/tramp-sh.el      2011-06-04 14:11:26 +0000
@@ -3641,9 +3641,11 @@
        (tramp-send-command vec "echo ~root" t)
        (cond
         ((or (string-match "^~root$" (buffer-string))
-             ;; The default shell (ksh93) of OpenSolaris is buggy.
-             (string-equal (tramp-get-connection-property vec "uname" "")
-                           "SunOS 5.11"))
+             ;; The default shell (ksh93) of OpenSolaris and Solaris
+             ;; is buggy.  We've got reports for "SunOS 5.10" and
+             ;; "SunOS 5.11" so far.
+             (string-match (regexp-opt '("SunOS 5.10" "SunOS 5.11"))
+                           (tramp-get-connection-property vec "uname" "")))
          (setq shell
                (or (tramp-find-executable
                     vec "bash" (tramp-get-remote-path vec) t t)