diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-28 22:25:55 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-28 22:25:55 +0000 |
commit | a5dfaca00a94bc3d135aae52b4458f5a355bf0ed (patch) | |
tree | 77c9580bb289422d6e97749934a8c24c8aadc76c /lib/rubygems/installer.rb | |
parent | 3fc7731297d8de1f52cec9382a4f1f0a08bea949 (diff) | |
download | ruby-a5dfaca00a94bc3d135aae52b4458f5a355bf0ed.tar.gz |
* lib/rubygems/ext/builder.rb: Fix incompatibilities when installing
extensions. Patch by Nobu.
[ruby-trunk - Bug #7968] [ruby-trunk - Bug #7971]
* lib/rubygems/ext/ext_conf_builder.rb: ditto.
* lib/rubygems/installer.rb: ditto.
* test/rubygems/test_gem_ext_ext_conf_builder.rb: Test for the above.
* test/rubygems/test_gem_installer.rb: ditto.
* lib/rubygems/commands/sources_command.rb: Prefer HTTPS over HTTP.
* lib/rubygems/defaults.rb: ditto
* lib/rubygems/dependency_resolver.rb: Ditto.
* lib/rubygems/source.rb: ditto.
* lib/rubygems/spec_fetcher.rb: ditto.
* lib/rubygems/specification.rb: ditto.
* lib/rubygems/test_utilities.rb: ditto.
* test/rubygems/test_gem.rb: Test for the above.
* test/rubygems/test_gem_commands_sources_command.rb: ditto.
* test/rubygems/test_gem_dependency_resolver_api_set.rb: ditto.
* test/rubygems/test_gem_remote_fetcher.rb: ditto.
* test/rubygems/test_gem_source.rb: ditto.
* test/rubygems/test_gem_spec_fetcher.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/installer.rb')
-rw-r--r-- | lib/rubygems/installer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 3f4c6943df..4a41891b48 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -681,7 +681,7 @@ TEXT say results.join("\n") if Gem.configuration.really_verbose end rescue - extension_build_error(extension_dir, results.join("\n")) + extension_build_error(extension_dir, results.join("\n"), $@) end end end @@ -689,7 +689,7 @@ TEXT ## # Logs the build +output+ in +build_dir+, then raises ExtensionBuildError. - def extension_build_error(build_dir, output) + def extension_build_error(build_dir, output, backtrace = nil) gem_make_out = File.join build_dir, 'gem_make.out' open gem_make_out, 'wb' do |io| io.puts output end @@ -703,7 +703,7 @@ Gem files will remain installed in #{gem_dir} for inspection. Results logged to #{gem_make_out} EOF - raise ExtensionBuildError, message + raise ExtensionBuildError, message, backtrace end ## |