diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fileutils.rb | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Sat Mar 3 22:57:11 2007 Minero Aoki <aamine@loveruby.net> + + * lib/fileutils.rb (touch): last commit causes error if :mtime + option was not given. + Sat Mar 3 22:37:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_file_s_utime): allow nil to set the current time. diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 9216c7477b..68acb1623e 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1014,13 +1014,9 @@ module FileUtils fu_check_options options, OPT_TABLE['touch'] list = fu_list(list) created = nocreate = options[:nocreate] - t = options[:mtime] + t = options[:mtime] || Time.now 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| |