summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-20 22:29:13 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-20 22:29:13 +0000
commit79a569f458e1ea58d3bf5fe6ddc9604994616daf (patch)
treed3ffed37462aa3984664c1ef5155f659adda6066
parentc8914f256e8a10603e3283494e3ac9308f8c8df6 (diff)
merge revision(s) 31575:
* lib/fileutils.rb (FileUtils#touch): Fix corrupted output. ref [ruby-dev:43401] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/fileutils.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ba1043824..e326e783bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 21 04:54:20 2011 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/fileutils.rb (FileUtils#touch): Fix corrupted output.
+ ref [ruby-dev:43401]
+
Sat May 21 02:10:09 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.h (RMATCH_REGS): parenthesize cast expression. suggested
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 9b759c079d..81aa1e8207 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1027,7 +1027,7 @@ module FileUtils
created = nocreate = options[:nocreate]
t = options[:mtime]
if options[:verbose]
- fu_output_message "touch #{nocreate ? ' -c' : ''}#{t ? t.strftime(' -t %Y%m%d%H%M.%S') : ''}#{list.join ' '}"
+ fu_output_message "touch #{nocreate ? '-c ' : ''}#{t ? t.strftime('-t %Y%m%d%H%M.%S ') : ''}#{list.join ' '}"
end
return if options[:noop]
list.each do |path|
diff --git a/version.h b/version.h
index 0a0b7cf4a0..b48e4bce1c 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2011-05-21"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20110521
-#define RUBY_PATCHLEVEL 342
+#define RUBY_PATCHLEVEL 343
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8