From 80466df690e1fc952d661686baaa6f3b245d42a0 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 28 Mar 2013 14:11:35 +0000 Subject: * lib/resolv.rb: Test Windows platform by detecting LoadError when require 'win32/resolv' suggested by Nobuyoshi Nakada [ruby-core:53389]. [ruby-core:53388] [Feature #8090] Reported by Charles Nutter. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/resolv.rb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 685eb9e318..a0d4c16bc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 28 23:11:25 2013 Tanaka Akira + + * lib/resolv.rb: Test Windows platform by detecting LoadError when + require 'win32/resolv' suggested by Nobuyoshi Nakada [ruby-core:53389]. + [ruby-core:53388] [Feature #8090] Reported by Charles Nutter. + Thu Mar 28 23:10:10 2013 Nobuyoshi Nakada * include/ruby/io.h: rename SVR3,4 member names as POSIX compliants, diff --git a/lib/resolv.rb b/lib/resolv.rb index b38c42ab3f..e52649d32c 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -165,10 +165,10 @@ class Resolv # Resolv::Hosts is a hostname resolver that uses the system hosts file. class Hosts - if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM + begin require 'win32/resolv' DefaultFileName = Win32::Resolv.get_hosts_path - else + rescue LoadError DefaultFileName = '/etc/hosts' end -- cgit v1.2.3