shyouhei	2011-05-21 07:29:13 +0900 (Sat, 21 May 2011)

  New Revision: 31665

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

  Log:
    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@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/fileutils.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 31664)
+++ ruby_1_8_7/ChangeLog	(revision 31665)
@@ -1,3 +1,8 @@
+Sat May 21 04:54:20 2011  Akinori MUSHA  <knu@i...>
+
+	* lib/fileutils.rb (FileUtils#touch): Fix corrupted output.
+	  ref [ruby-dev:43401]
+
 Sat May 21 02:10:09 2011  Yukihiro Matsumoto  <matz@r...>
 
 	* re.h (RMATCH_REGS): parenthesize cast expression.  suggested
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 31664)
+++ ruby_1_8_7/version.h	(revision 31665)
@@ -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
Index: ruby_1_8_7/lib/fileutils.rb
===================================================================
--- ruby_1_8_7/lib/fileutils.rb	(revision 31664)
+++ ruby_1_8_7/lib/fileutils.rb	(revision 31665)
@@ -1027,7 +1027,7 @@
     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|

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