summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/fileutils.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index da4d4250b2..f6d8907b17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 15 14:58:06 2011 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/fileutils.rb (FileUtils#touch): Fix corrupted output when
+ mtime is specified in addition to nocreate (and verbose).
+ ref [ruby-dev:43401]
+
Thu Apr 14 23:43:43 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (ruby_float_step): wrong loop condition.
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 94af69ad2c..dc956a67ab 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1036,7 +1036,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|