diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-25 09:18:59 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-25 09:18:59 +0000 |
| commit | bc4be91a553b4b9f16a596d6daca6d70690b4e26 (patch) | |
| tree | 416d396467cf44440d6e96897181b7073a6026cc | |
| parent | d75e2ea21fe178100bd5c9d10b2e2f19b8125f10 (diff) | |
merge revision(s) 37048:
* lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path):
test_generate_bin_bindir_with_user_install_warning(TestGemInstaller)
fails on Windows with msys bash. It makes comparing paths
case-insensitive.
pick from upstream to fix a failure of test-all [ruby-core:47711]
https://github.com/rubygems/rubygems/commit/c474edb2f3704206f04da1c8c6cf9fb079d84abe
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/rubygems/installer.rb | 8 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Thu Oct 25 18:16:25 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path): + test_generate_bin_bindir_with_user_install_warning(TestGemInstaller) + fails on Windows with msys bash. It makes comparing paths + case-insensitive. + pick from upstream to fix a failure of test-all [ruby-core:47711] + https://github.com/rubygems/rubygems/commit/c474edb2f3704206f04da1c8c6cf9fb079d84abe + Thu Oct 25 17:55:01 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil. diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 31fb1209c9..514316f099 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -435,7 +435,13 @@ class Gem::Installer def check_that_user_bin_dir_is_in_path user_bin_dir = @bin_dir || Gem.bindir(gem_home) user_bin_dir.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR - unless ENV['PATH'].split(File::PATH_SEPARATOR).include? user_bin_dir then + path = ENV['PATH'] + if Gem.win_platform? then + path = path.downcase + user_bin_dir = user_bin_dir.downcase + end + + unless path.split(File::PATH_SEPARATOR).include? user_bin_dir then unless self.class.path_warning then alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t gem executables will not run." self.class.path_warning = true @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 300 +#define RUBY_PATCHLEVEL 301 #define RUBY_RELEASE_DATE "2012-10-25" #define RUBY_RELEASE_YEAR 2012 |