[Emacs-diffs] /srv/bzr/emacs/trunk r111378: * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context):

[Michael Albinus]

------------------------------------------------------------
revno: 111378
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2012-12-30 11:58:13 +0100
message:
  * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context):
  Return `t' on success.
  
  * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
  handler for `set-file-selinux-context'.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el
  lisp/net/tramp-smb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-29 19:11:11 +0000
+++ b/lisp/ChangeLog    2012-12-30 10:58:13 +0000
@@ -1,3 +1,11 @@
+2012-12-30  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context):
+       Return `t' on success.
+
+       * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
+       handler for `set-file-selinux-context'.
+
 2012-12-29  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-sh-handle-file-acl): Suppress basic attributes.

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-12-29 19:11:11 +0000
+++ b/lisp/net/tramp-sh.el      2012-12-30 10:58:13 +0000
@@ -1530,10 +1530,11 @@
                        (if (stringp (nth 3 context))
                            (format "--range=%s" (nth 3 context)) "")
                        (tramp-shell-quote-argument localname))))
-       (tramp-set-file-property v localname "file-selinux-context" context)
-      (tramp-set-file-property v localname "file-selinux-context" 'undef)))
-  ;; We always return nil.
-  nil)
+       (progn
+         (tramp-set-file-property v localname "file-selinux-context" context)
+         t)
+      (tramp-set-file-property v localname "file-selinux-context" 'undef)
+      nil)))
 
 (defun tramp-remote-acl-p (vec)
   "Check, whether ACL is enabled on the remote host."

=== modified file 'lisp/net/tramp-smb.el'
--- a/lisp/net/tramp-smb.el     2012-12-17 14:38:07 +0000
+++ b/lisp/net/tramp-smb.el     2012-12-30 10:58:13 +0000
@@ -230,7 +230,7 @@
     (rename-file . tramp-smb-handle-rename-file)
     (set-file-acl . ignore)
     (set-file-modes . tramp-smb-handle-set-file-modes)
-    ;; `set-file-selinux-context' performed by default handler.
+    (set-file-selinux-context . ignore)
     (set-file-times . ignore)
     (set-visited-file-modtime . ignore)
     (shell-command . tramp-handle-shell-command)