aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-16 00:44:47 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-16 00:44:47 +0000
commite6882349c09d3fd7d01478dd378994502777a164 (patch)
tree6afbdb0a6998d199114ed130f7608a4e4c6f4bc4
parent164ced04de494d709f9006cac920579d84b6befd (diff)
downloadruby-e6882349c09d3fd7d01478dd378994502777a164.tar.gz
* lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#download): should
use File.identical? to chech the identicality of the files. this fixed an error of a test on Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/rubygems/remote_fetcher.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bbdc62e75..e0a72d325b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 16 09:42:50 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/rubygems/remote_fetcher.rb (Gem::RemoteFetcher#download): should
+ use File.identical? to chech the identicality of the files.
+ this fixed an error of a test on Windows.
+
Sat Apr 14 12:55:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (UNREACHABLE): gcc 4.4 eliminates unreachable code
diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb
index e0d12987f3..9363052052 100644
--- a/lib/rubygems/remote_fetcher.rb
+++ b/lib/rubygems/remote_fetcher.rb
@@ -174,7 +174,7 @@ class Gem::RemoteFetcher
begin
FileUtils.cp source_path, local_gem_path unless
- File.expand_path(source_path) == File.expand_path(local_gem_path)
+ File.identical?(source_path, local_gem_path)
rescue Errno::EACCES
local_gem_path = source_uri.to_s
end