summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--file.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a78215929..7f7853ab1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 25 23:47:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* test/ruby/test_literal.rb (TestRubyLiteral#test_special_const):
diff --git a/file.c b/file.c
index d1746a9c2d..f6ec06bd4e 100644
--- a/file.c
+++ b/file.c
@@ -2268,7 +2268,7 @@ utime_internal(const char *path, VALUE pathv, void *arg)
try_utimensat = 0;
goto no_utimensat;
}
- utime_failed(path, tsp, v->atime, v->mtime);
+ utime_failed(pathv, tsp, v->atime, v->mtime);
}
return;
}
diff --git a/version.h b/version.h
index 459579b7de..a2bc889297 100644
--- a/version.h
+++ b/version.h
@@ -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