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

Merge pull request #5698 from aneeshusa/dont-report-plugins-when-disabled 

If plugins are disabled, report them as not available.
This commit is contained in:
Seth Vargo 2015-05-30 11:56:44 -07:00
parent 7e0ca7bb2c 16ac4e2321
commit 2175625b61
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vagrant.rb
View File

@ -139,10 +139,12 @@ module Vagrant
Config.run(version, &block) Config.run(version, &block)
end end
# This checks if a plugin with the given name is installed. This can # This checks if a plugin with the given name is available (installed
# be used from the Vagrantfile to easily branch based on plugin # and enabled). This can be used from the Vagrantfile to easily branch
# availability. # based on plugin availability.
def self.has_plugin?(name, version=nil) def self.has_plugin?(name, version=nil)
return false unless Vagrant.plugins_enabled?
if !version if !version
# We check the plugin names first because those are cheaper to check # We check the plugin names first because those are cheaper to check
return true if plugin("2").manager.registered.any? { |p| p.name == name } return true if plugin("2").manager.registered.any? { |p| p.name == name }