From 78f31c7be6ceb0b64309cd6162aaf23d9511d776 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Jan 2005 11:11:44 +0000
Subject: [PATCH] * lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise
 ResolvError.   reported by Sam Roberts.  [ruby-talk:127133]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     | 5 +++++
 lib/resolv.rb | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b2d48c473..b37ded6e33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 21 20:07:02 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
+	  reported by Sam Roberts.  [ruby-talk:127133]
+
 Fri Jan 21 17:09:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (decode_utf7): use pack("U*") to encode UTF-8.
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 84b0d0f10f..80536fbdd8 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -869,10 +869,8 @@ class Resolv
             rescue NXDomain
             end
           }
-        rescue OtherResolvError
-          raise ResolvError.new("DNS error: #{$!.message}")
+        rescue ResolvError
         end
-        raise ResolvError.new("DNS resolv error: #{name}")
       end
 
       class NXDomain < ResolvError