[Emacs-diffs] emacs-24 r117658: * net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise

[Michael Albinus]

------------------------------------------------------------
revno: 117658
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-11-02 12:22:56 +0100
message:
  * net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise
  an error when the command fails; the return code must indicate.
  (tramp-adb-send-command-and-check): Fix docstring.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-adb.el          trampadb.el-20121204164216-03wyr5miam215d7f-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-01 17:33:29 +0000
+++ b/lisp/ChangeLog    2014-11-02 11:22:56 +0000
@@ -1,3 +1,9 @@
+2014-11-02  Michael Albinus  <address@hidden>
+
+       * net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise
+       an error when the command fails; the return code must indicate.
+       (tramp-adb-send-command-and-check): Fix docstring.
+
 2014-11-01  Michael Albinus  <address@hidden>
 
        * net/tramp-cache.el (tramp-get-file-property)

=== modified file 'lisp/net/tramp-adb.el'
--- a/lisp/net/tramp-adb.el     2014-11-01 13:34:45 +0000
+++ b/lisp/net/tramp-adb.el     2014-11-02 11:22:56 +0000
@@ -794,11 +794,13 @@
       ;; directory.
       (condition-case nil
          (progn
-           (setq ret 0)
-           (tramp-adb-barf-unless-okay
-            v (format "(cd %s; %s)"
-                      (tramp-shell-quote-argument localname) command)
-            "")
+           (setq ret
+                 (if (tramp-adb-send-command-and-check
+                      v
+                      (format "(cd %s; %s)"
+                              (tramp-shell-quote-argument localname) command))
+                     ;; Set return status accordingly.
+                     0 1))
            ;; We should add the output anyway.
            (when outbuf
              (with-current-buffer outbuf
@@ -1031,8 +1033,9 @@
 (defun tramp-adb-send-command-and-check
   (vec command)
   "Run COMMAND and check its exit status.
-Sends `echo $?' along with the COMMAND for checking the exit status.  If
-COMMAND is nil, just sends `echo $?'.  Returns the exit status found."
+Sends `echo $?' along with the COMMAND for checking the exit
+status.  If COMMAND is nil, just sends `echo $?'.  Returns nil if
+the exit status is not equal 0, and t otherwise."
   (tramp-adb-send-command
    vec (if command
           (format "%s; echo tramp_exit_status $?" command)