diff options
| -rw-r--r-- | lib/bundler/installer/gem_installer.rb | 7 | ||||
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 16 |
2 files changed, 1 insertions, 22 deletions
diff --git a/lib/bundler/installer/gem_installer.rb b/lib/bundler/installer/gem_installer.rb index 1df86ccfbc..13a1356f56 100644 --- a/lib/bundler/installer/gem_installer.rb +++ b/lib/bundler/installer/gem_installer.rb @@ -13,7 +13,7 @@ module Bundler end def install_from_spec - post_install_message = spec_settings ? install_with_settings : install + post_install_message = install Bundler.ui.debug "#{worker}: #{spec.name} (#{spec.version}) from #{spec.loaded_from}" generate_executable_stubs return true, post_install_message @@ -54,11 +54,6 @@ module Bundler spec.source.install(spec, :force => force, :ensure_builtin_gems_cached => standalone, :build_args => Array(spec_settings)) end - def install_with_settings - # Build arguments are global, so this is mutexed - Bundler.rubygems.install_with_build_args([spec_settings]) { install } - end - def out_of_space_message "#{install_error_message}\nYour disk is out of space. Free some space to be able to install your bundle." end diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb index 8589c14704..ba4317775e 100644 --- a/lib/bundler/rubygems_integration.rb +++ b/lib/bundler/rubygems_integration.rb @@ -232,18 +232,6 @@ module Bundler EXT_LOCK end - def with_build_args(args) - ext_lock.synchronize do - old_args = build_args - begin - self.build_args = args - yield - ensure - self.build_args = old_args - end - end - end - def spec_from_gem(path, policy = nil) require "rubygems/security" require_relative "psyched_yaml" @@ -550,10 +538,6 @@ module Bundler Gem::REPOSITORY_SUBDIRECTORIES end - def install_with_build_args(args) - yield - end - def path_separator Gem.path_separator end |