1 files changed, 35 insertions, 10 deletions
@@ -21,15 +21,19 @@ module Bundler
 @rubygems_sources = []
 @metadata_source = Source::Metadata.new
- @disable_multisource = true
 end
- def disable_multisource?
- @disable_multisource
 end
 def merged_gem_lockfile_sections!
- @disable_multisource = false
 end
 def add_path_source(options = {})
@@ -70,7 +74,11 @@ module Bundler
 end
 def rubygems_sources
- @rubygems_sources + [global_rubygems_source]
 end
 def rubygems_remotes
@@ -81,16 +89,27 @@ module Bundler
 path_sources + git_sources + plugin_sources + rubygems_sources + [metadata_source]
 end
 def get(source)
 source_list_for(source).find {|s| equal_source?(source, s) || equivalent_source?(source, s) }
 end
 def lock_sources
- lock_sources = (path_sources + git_sources + plugin_sources).sort_by(&:to_s)
- if disable_multisource?
- lock_sources + rubygems_sources.sort_by(&:to_s).uniq
 else
- lock_sources << combine_rubygems_sources
 end
 end
@@ -104,7 +123,7 @@ module Bundler
 end
 end
- replacement_rubygems = !disable_multisource? &&
 replacement_sources.detect {|s| s.is_a?(Source::Rubygems) }
 @global_rubygems_source = replacement_rubygems if replacement_rubygems
@@ -113,6 +132,10 @@ module Bundler
 false
 end
 def cached!
 all_sources.each(&:cached!)
 end
@@ -162,6 +185,8 @@ module Bundler
 end
 def equal_source?(source, other_source)
 source == other_source
 end