* net/tramp.el (tramp-touch): Use UTC to express time.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f297921fb75752354492e60d69c1032aa2ad9fe..b3ec21cba3f25fb898ca5fd74fb8dce5029a758c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-15  Katsumi Yamaoka  <yamaoka@jpl.org>  (tiny change)
+
+       * net/tramp.el (tramp-touch): Use UTC to express time.
+
 2006-06-15  Chong Yidong  <cyd@stupidchicken.com>
 
        * mail/sendmail.el (mail-send): Search explicitly for

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2ebc4d0b45eaf4e6c662b3a9db39fc3fc85e5821..c4166bb6d24e6a619a308b8d8fb8e231d4afa4a1 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5017,15 +5017,16 @@ hosts, or files, disagree."
 (defun tramp-touch (file time)
   "Set the last-modified timestamp of the given file.
 TIME is an Emacs internal time value as returned by `current-time'."
-  (let ((touch-time (format-time-string "%Y%m%d%H%M.%S" time)))
+  (let ((touch-time (format-time-string "%Y%m%d%H%M.%S" time t)))
     (if (tramp-tramp-file-p file)
        (with-parsed-tramp-file-name file nil
          (let ((buf (tramp-get-buffer multi-method method user host)))
            (unless (zerop (tramp-send-command-and-check
                            multi-method method user host
-                           (format "touch -t %s %s"
+                           (format "TZ=UTC; export TZ; touch -t %s %s"
                                    touch-time
-                                   localname)))
+                                   localname)
+                           t))
              (pop-to-buffer buf)
              (error "tramp-touch: touch failed, see buffer `%s' for details"
                     buf))))