From 42e6d68f012f4ed6be495fd662eb5e19d44d2235 Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 3 Mar 2007 13:54:54 +0000
Subject: * lib/fileutils.rb (touch): last #touch change causes error when
 :mtime option was not given.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/fileutils.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 386ea35f8..73ee07202 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1012,13 +1012,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|
-- 
cgit