procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid recursive detection of remote uid and gid in tramp-gvfs.el

Browse source 
* lisp/net/tramp-gvfs.el (tramp-gvfs-get-remote-uid-gid-in-progress):
New variable.
(tramp-gvfs-maybe-open-connection): Use it.

* test/lisp/net/tramp-tests.el (tramp-test18-file-attributes):
Reorder test.
This commit is contained in:
Michael Albinus 2016-07-09 14:20:07 +02:00
parent e4adb6cdf3
commit bfc29a5bce
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lisp/net/tramp-gvfs.el
View file

@ -1607,6 +1607,9 @@ ID-FORMAT valid values are `string' and `integer'."
((equal id-format 'integer) tramp-unknown-id-integer)
((equal id-format 'string) tramp-unknown-id-string)))))
(defvar tramp-gvfs-get-remote-uid-gid-in-progress nil
"Indication, that remote uid and gid determination is in progress.")
(defun tramp-gvfs-maybe-open-connection (vec)
"Maybe open a connection VEC.
Does not do anything if a connection is already open, but re-opens the
@ -1717,14 +1720,12 @@ connection if a previous connection has died for some reason."
;; In `tramp-check-cached-permissions', the connection properties
;; {uig,gid}-{integer,string} are used. We set them to proper values.
(unless (tramp-get-connection-property vec "uid-integer" nil)
(tramp-gvfs-get-remote-uid vec 'integer))
(unless (tramp-get-connection-property vec "gid-integer" nil)
(tramp-gvfs-get-remote-gid vec 'integer))
(unless (tramp-get-connection-property vec "uid-string" nil)
(tramp-gvfs-get-remote-uid vec 'string))
(unless (tramp-get-connection-property vec "gid-string" nil)
(tramp-gvfs-get-remote-gid vec 'string)))
(unless tramp-gvfs-get-remote-uid-gid-in-progress
(let ((tramp-gvfs-get-remote-uid-gid-in-progress t))
(tramp-gvfs-get-remote-uid vec 'integer)
(tramp-gvfs-get-remote-gid vec 'integer)
(tramp-gvfs-get-remote-uid vec 'string)
(tramp-gvfs-get-remote-gid vec 'string))))
(defun tramp-gvfs-send-command (vec command &rest args)
"Send the COMMAND with its ARGS to connection VEC.

6
test/lisp/net/tramp-tests.el
View file

@ -1113,12 +1113,12 @@ This tests also `file-readable-p' and `file-regular-p'."
(progn
(write-region "foo" nil tmp-name1)
(should (file-exists-p tmp-name1))
(setq attr (file-attributes tmp-name1))
(should (consp attr))
(should (file-exists-p tmp-name1))
(should (file-readable-p tmp-name1))
(should (file-regular-p tmp-name1))
;; We do not test inodes and device numbers.
(setq attr (file-attributes tmp-name1))
(should (consp attr))
(should (null (car attr)))
(should (numberp (nth 1 attr))) ;; Link.
(should (numberp (nth 2 attr))) ;; Uid.