summaryrefslogtreecommitdiff
path: root/lib/bundler/plugin/installer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/bundler/plugin/installer.rb')
-rw-r--r--lib/bundler/plugin/installer.rb17
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/bundler/plugin/installer.rb b/lib/bundler/plugin/installer.rb
index 26cec4f18c..73198aec04 100644
--- a/lib/bundler/plugin/installer.rb
+++ b/lib/bundler/plugin/installer.rb
@@ -16,15 +16,13 @@ module Bundler
version = options[:version] || [">= 0"]
- Bundler.settings.temporary(:disable_multisource => false) do
- if options[:git]
- install_git(names, version, options)
- elsif options[:local_git]
- install_local_git(names, version, options)
- else
- sources = options[:source] || Bundler.rubygems.sources
- install_rubygems(names, version, sources)
- end
+ if options[:git]
+ install_git(names, version, options)
+ elsif options[:local_git]
+ install_local_git(names, version, options)
+ else
+ sources = options[:source] || Bundler.rubygems.sources
+ install_rubygems(names, version, sources)
end
end
@@ -84,6 +82,7 @@ module Bundler
deps = names.map {|name| Dependency.new name, version }
definition = Definition.new(nil, deps, source_list, true)
+ definition.allow_multisource!
install_definition(definition)
end