summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-01-06 09:34:16 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-01-06 09:34:16 +0000
commit6254d7103bb1208ed1e11f94dfb904da3f7e54b0 (patch)
tree178512d266eff9e1152779a77ba898717211e3f4
parenta8bb4ed57719a231d4a15bda964476b0b373d03c (diff)
* lib/fileutils.rb (ln): add ' -f' in the verbose message.
* lib/fileutils.rb (cp_r): add 'p' in the verbose message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/fileutils.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 409f7c1afa..1a60e659dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 6 18:31:45 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * lib/fileutils.rb (ln): add ' -f' in the verbose message.
+
+ * lib/fileutils.rb (cp_r): add 'p' in the verbose message.
+
Mon Jan 6 13:26:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c (proc_exec_v): follow to proc_spawn_v(). call do_aspawn()
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 0e8b8124db..9f2bd37a64 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -326,7 +326,7 @@ module FileUtils
def ln( src, dest, *options )
force, noop, verbose, = fu_parseargs(options, :force, :noop, :verbose)
- fu_output_message "ln #{[src,dest].flatten.join ' '}" if verbose
+ fu_output_message "ln#{force ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if verbose
return if noop
fu_each_src_dest(src, dest) do |s,d|
@@ -372,7 +372,7 @@ module FileUtils
def cp_r( src, dest, *options )
preserve, noop, verbose, = fu_parseargs(options, :preserve, :noop, :verbose)
- fu_output_message "cp -r #{[src,dest].flatten.join ' '}" if verbose
+ fu_output_message "cp -r#{preserve ? 'p' : ''} #{[src,dest].flatten.join ' '}" if verbose
return if noop
fu_each_src_dest(src, dest) do |s,d|