haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only install from defined sources unless install is local

This commit is contained in:
Chris Roberts 2016-11-11 14:44:14 -08:00
parent d8455c0a9a
commit 1691e3af58
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vagrant/bundler.rb
View File

@ -146,7 +146,7 @@ module Vagrant
'local_source' => plugin_source 'local_source' => plugin_source
} }
} }
internal_install(plugin_info, {}) internal_install(plugin_info, {}, local_install: true)
plugin_source.spec plugin_source.spec
end end
@ -224,8 +224,10 @@ module Vagrant
def internal_install(plugins, update, **extra) def internal_install(plugins, update, **extra)
update = {} unless update.is_a?(Hash) # Only clear Gem sources if not performing local install
Gem.sources.clear if !extra[:local_install]
update = {} unless update.is_a?(Hash)
installer_set = Gem::Resolver::InstallerSet.new(:both) installer_set = Gem::Resolver::InstallerSet.new(:both)
# Generate all required plugin deps # Generate all required plugin deps