diff options
| -rw-r--r-- | lib/bundler/installer.rb | 22 | ||||
| -rw-r--r-- | lib/bundler/source.rb | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index b449202a18..2935e2449e 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -53,12 +53,6 @@ module Bundler # Return unless all the dependencies have = version requirements return if dependencies.any? { |d| ambiguous?(d) } - index = local_index - sources.each do |source| - next unless source.respond_to?(:local_specs) - index = source.local_specs.merge(index) - end - source_requirements = {} dependencies.each do |dep| next unless dep.source && dep.source.respond_to?(:local_specs) @@ -118,14 +112,26 @@ module Bundler index = cache_source.specs.merge(index).freeze end - sources.each do |source| + rg_sources = sources.select { |s| s.is_a?(Source::Rubygems) } + other_sources = sources.select { |s| !s.is_a?(Source::Rubygems) } + + other_sources.each do |source| i = source.specs Bundler.ui.debug "Source: Processing index... " index = i.merge(index).freeze Bundler.ui.debug "Done." end - Index.from_installed_gems.merge(index) + index = Index.from_installed_gems.merge(index) + + rg_sources.each do |source| + i = source.specs + Bundler.ui.debug "Source: Processing index... " + index = i.merge(index).freeze + Bundler.ui.debug "Done." + end + + index end end diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 9df58eb60d..69c6cae97d 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -247,8 +247,6 @@ module Bundler end git "fetch --quiet" git "reset --hard #{revision}" - git "submodule init" - git "submodule update" end @installed = true end |