[Emacs-diffs] /srv/bzr/emacs/trunk r111266: * net/tramp-sh.el (tramp-sh-handle-file-acl): Delete empty lines

[Michael Albinus]

------------------------------------------------------------
revno: 111266
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2012-12-19 14:01:16 +0100
message:
  * net/tramp-sh.el (tramp-sh-handle-file-acl): Delete empty lines
  and text properties from returned ACL string.
  (tramp-sh-handle-set-file-acl): Do not use additional parentheses
  for "setfacl" command.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-18 13:37:06 +0000
+++ b/lisp/ChangeLog    2012-12-19 13:01:16 +0000
@@ -1,3 +1,10 @@
+2012-12-19  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-sh-handle-file-acl): Delete empty lines
+       and text properties from returned ACL string.
+       (tramp-sh-handle-set-file-acl): Do not use additional parentheses
+       for "setfacl" command.
+
 2012-12-18  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-error-with-buffer): Give a hint to use

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-12-17 14:38:07 +0000
+++ b/lisp/net/tramp-sh.el      2012-12-19 13:01:16 +0000
@@ -1549,7 +1549,9 @@
                     "getfacl -ac %s 2>/dev/null"
                     (tramp-shell-quote-argument localname))))
        (with-current-buffer (tramp-get-connection-buffer v)
-         (buffer-string))))))
+         (goto-char (point-max))
+         (delete-blank-lines)
+         (substring-no-properties (buffer-string)))))))
 
 (defun tramp-sh-handle-set-file-acl (filename acl-string)
   "Like `set-file-acl' for Tramp files."
@@ -1557,11 +1559,8 @@
     (if (and (stringp acl-string)
             (tramp-remote-acl-p v)
             (tramp-send-command-and-check
-             v
-             (format "setfacl --set-file=- %s <<'EOF'\n%s\nEOF\n"
-                     (tramp-shell-quote-argument localname)
-                     acl-string)
-             t))
+             v (format "setfacl --set-file=- %s <<'EOF'\n%s\nEOF\n"
+                       (tramp-shell-quote-argument localname) acl-string)))
        (tramp-set-file-property v localname "file-acl" acl-string)
       (tramp-set-file-property v localname "file-acl-string" 'undef)))
   ;; We always return nil.