diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-30 00:54:12 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-30 00:54:12 +0000 |
commit | 9f1495232eca5a3c14509ac9acee60b40acd9e0e (patch) | |
tree | 07c1340a8c4ea3d0b7ae2f209866af85de089f27 /lib/rubygems.rb | |
parent | 86b4e3bb817c4f2992a60eba88b2543d80123804 (diff) | |
download | ruby-9f1495232eca5a3c14509ac9acee60b40acd9e0e.tar.gz |
* lib/rubygems: Update to RubyGems HEAD(60d7972).
this version contains pull requests number of #1343, #1356, #1357, #1363
at https://github.com/rubygems/rubygems/pulls
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems.rb')
-rw-r--r-- | lib/rubygems.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index c8dbcad230..c84a67ba76 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -597,6 +597,9 @@ module Gem test_syck = ENV['TEST_SYCK'] + # Only Ruby 1.8 and 1.9 have syck + test_syck = false unless /^1\./ =~ RUBY_VERSION + unless test_syck begin gem 'psych', '>= 1.2.1' @@ -778,6 +781,14 @@ module Gem open path, 'rb' do |f| f.read end + rescue Errno::ENOLCK # NFS + if Thread.main != Thread.current + raise + else + open path, 'rb' do |f| + f.read + end + end end ## |