Permalink
Browse files

merge revision(s) 31575:

?\012
	* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@31665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 1252ce6 commit 85ec21a82df93354c75650a80f3b6dcaa7166b80 @shyouhei shyouhei committed May 20, 2011
Showing with 7 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1 lib/fileutils.rb
  3. +1 −1 version.h
View
@@ -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
View
@@ -1027,7 +1027,7 @@ def touch(list, options = {})
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|
View
@@ -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

0 comments on commit 85ec21a

Please sign in to comment.