diff options
Diffstat (limited to 'lib/bundler/installer/parallel_installer.rb')
-rw-r--r-- | lib/bundler/installer/parallel_installer.rb | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/bundler/installer/parallel_installer.rb b/lib/bundler/installer/parallel_installer.rb index 851b6c8d41..83a381f592 100644 --- a/lib/bundler/installer/parallel_installer.rb +++ b/lib/bundler/installer/parallel_installer.rb @@ -47,13 +47,6 @@ module Bundler dependencies.all? {|d| installed_specs.include? d.name } end - # Check whether spec's dependencies are missing, which can indicate a - # corrupted lockfile - def dependencies_missing?(all_specs) - spec_names = all_specs.map(&:name) - dependencies.any? {|d| !spec_names.include? d.name } - end - # Represents only the non-development dependencies, the ones that are # itself and are in the total list. def dependencies @@ -123,11 +116,7 @@ module Bundler unmet_dependencies.each do |spec, unmet_spec_dependencies| unmet_spec_dependencies.each do |unmet_spec_dependency| found = @specs.find {|s| s.name == unmet_spec_dependency.name && !unmet_spec_dependency.matches_spec?(s.spec) } - if found - warning << "* #{unmet_spec_dependency}, dependency of #{spec.full_name}, unsatisfied by #{found.full_name}" - else - warning << "* #{unmet_spec_dependency}, dependency of #{spec.full_name} but missing from lockfile" - end + warning << "* #{unmet_spec_dependency}, dependency of #{spec.full_name}, unsatisfied by #{found.full_name}" end end @@ -224,8 +213,6 @@ module Bundler if spec.dependencies_installed? @specs spec.state = :enqueued worker_pool.enq spec - elsif spec.dependencies_missing? @specs - spec.state = :failed end end end |