From e4b24398c67ee11e628658f64fcf8f9d211d4b0f Mon Sep 17 00:00:00 2001 From: aamine Date: Thu, 20 Nov 2003 10:16:27 +0000 Subject: * lib/fileutils.rb (have_st_ino?): emx (OS/2 with EMX) does not have st_ino (always 0). [ruby-dev:21972] * lib/fileutils.rb (rename_cannot_overwrite_file?): emx does not allow overwriting files by rename(2). * test/fileutils/test_fileutils.rb: windows? -> have_drive_letter?, have_file_perm? git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/fileutils.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 0210e64f0..ee62f5838 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -437,7 +437,7 @@ module FileUtils return if options[:noop] fu_each_src_dest(src, dest) do |s,d| - if cannot_overwrite_file? and File.file?(d) + if rename_cannot_overwrite_file? and File.file?(d) File.unlink d end @@ -464,10 +464,10 @@ module FileUtils alias move mv - def cannot_overwrite_file? #:nodoc: - /djgpp|cygwin|mswin|mingw|bccwin|wince/ === RUBY_PLATFORM + def rename_cannot_overwrite_file? #:nodoc: + /djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ !~ RUBY_PLATFORM end - private :cannot_overwrite_file? + private :rename_cannot_overwrite_file? # @@ -751,7 +751,7 @@ module FileUtils end def have_st_ino? - /djgpp|mswin|mingw|bccwin|wince/ !~ RUBY_PLATFORM + /mswin|mingw|bccwin|wince|emx/ !~ RUBY_PLATFORM end def fu_stream_blksize( *streams ) -- cgit