ruby-changes:5706
From: shyouhei <ko1@a...>
Date: Sun, 15 Jun 2008 20:31:32 +0900 (JST)
Subject: [ruby-changes:5706] Ruby:r17212 (ruby_1_8_5): merge revision(s) 15823:
shyouhei 2008-06-15 20:29:46 +0900 (Sun, 15 Jun 2008) New Revision: 17212 Modified files: branches/ruby_1_8_5/ChangeLog branches/ruby_1_8_5/ext/Win32API/lib/win32/registry.rb branches/ruby_1_8_5/ext/Win32API/lib/win32/resolv.rb branches/ruby_1_8_5/lib/resolv.rb branches/ruby_1_8_5/version.h Log: merge revision(s) 15823: * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin. [ruby-dev:29945], [ruby-dev:34095] * lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased name too for cygwin. [ruby-dev:29945] * lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/Win32API/lib/win32/resolv.rb?r1=17212&r2=17211&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/Win32API/lib/win32/registry.rb?r1=17212&r2=17211&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17212&r2=17211&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17212&r2=17211&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/resolv.rb?r1=17212&r2=17211&diff_format=u Index: ruby_1_8_5/ext/Win32API/lib/win32/registry.rb =================================================================== --- ruby_1_8_5/ext/Win32API/lib/win32/registry.rb (revision 17211) +++ ruby_1_8_5/ext/Win32API/lib/win32/registry.rb (revision 17212) @@ -493,7 +493,7 @@ # utility functions # def self.expand_environ(str) - str.gsub(/%([^%]+)%/) { ENV[$1] || $& } + str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& } end @@type2name = { } Index: ruby_1_8_5/ext/Win32API/lib/win32/resolv.rb =================================================================== --- ruby_1_8_5/ext/Win32API/lib/win32/resolv.rb (revision 17211) +++ ruby_1_8_5/ext/Win32API/lib/win32/resolv.rb (revision 17212) @@ -11,7 +11,7 @@ def self.get_hosts_path path = get_hosts_dir - path = File.join(path.gsub(/\\/, File::SEPARATOR), 'hosts') + path = File.expand_path('hosts', path) File.exist?(path) ? path : nil end Index: ruby_1_8_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 17211) +++ ruby_1_8_5/ChangeLog (revision 17212) @@ -1,3 +1,13 @@ +Sun Jun 15 20:28:45 2008 Nobuyoshi Nakada <nobu@r...> + + * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin. + [ruby-dev:29945], [ruby-dev:34095] + + * lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased + name too for cygwin. [ruby-dev:29945] + + * lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path. + Sun Jun 15 20:27:21 2008 Nobuyoshi Nakada <nobu@r...> * misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 17211) +++ ruby_1_8_5/version.h (revision 17212) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 186 +#define RUBY_PATCHLEVEL 187 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_5/lib/resolv.rb =================================================================== --- ruby_1_8_5/lib/resolv.rb (revision 17211) +++ ruby_1_8_5/lib/resolv.rb (revision 17212) @@ -278,7 +278,7 @@ end class Hosts - if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM + if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM require 'win32/resolv' DefaultFileName = Win32::Resolv.get_hosts_path else -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/