naruse	2012-02-25 23:48:47 +0900 (Sat, 25 Feb 2012)

  New Revision: 34815

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34815

  Log:
    merge revision(s) 34792:
    
    * file.c (utime_internal): fix a variable missed to replace.
      [ruby-core:42864] [Bug #6077]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/file.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34814)
+++ ruby_1_9_3/ChangeLog	(revision 34815)
@@ -1,3 +1,8 @@
+Sat Feb 25 23:47:49 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (utime_internal): fix a variable missed to replace.
+	  [ruby-core:42864] [Bug #6077]
+
 Sat Feb 25 21:29:09 2012  URABE Shyouhei  <shyouhei@r...>
 
 	* test/ruby/test_literal.rb (TestRubyLiteral#test_special_const):
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34814)
+++ ruby_1_9_3/version.h	(revision 34815)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 148
+#define RUBY_PATCHLEVEL 149
 
 #define RUBY_RELEASE_DATE "2012-02-25"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/file.c
===================================================================
--- ruby_1_9_3/file.c	(revision 34814)
+++ ruby_1_9_3/file.c	(revision 34815)
@@ -2268,7 +2268,7 @@
                 try_utimensat = 0;
                 goto no_utimensat;
             }
-            utime_failed(path, tsp, v->atime, v->mtime);
+            utime_failed(pathv, tsp, v->atime, v->mtime);
         }
         return;
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/