diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-07 22:19:19 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-07 22:19:19 +0000 |
| commit | 89ba151440a243e44fc6afa93eed871887cbf195 (patch) | |
| tree | 74f441c3c64d39ed7b004208fe449698ac67056b | |
| parent | 1b2276af640dd19bb5379b5ad2f870b79cdd016f (diff) | |
lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
This allows "gem install /path/to/local.gem" to be successful
on a machine without a network connection.
[ruby-core:67411] [Bug #10712]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/resolv.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Jan 8 07:17:14 2015 Eric Wong <e@80x24.org> + + * lib/resolv.rb: consider ENETUNREACH as ResolvTimeout + [ruby-core:67411] [Bug #10712] + Thu Jan 8 00:13:52 2015 Tanaka Akira <akr@fsij.org> * lib/open3.rb: Open3 properly passes non-keyword hash args to spawn. diff --git a/lib/resolv.rb b/lib/resolv.rb index a801cf6ff4..6498615d79 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -670,8 +670,8 @@ class Resolv timelimit = start + tout begin sender.send - rescue Errno::EHOSTUNREACH - # multi-homed IPv6 may generate this + rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this + Errno::ENETUNREACH raise ResolvTimeout end while true |