Skip to content

Commit

Permalink
Update Berkshelf plugin detection
Browse files Browse the repository at this point in the history
Berkshelf has recently renamed their Vagrant plugin which is already updated in master, but this detection of the old plugin will prevent a kitchen run.
  • Loading branch information
martinisoft committed Apr 19, 2013
1 parent 7534072 commit cce07f3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/kitchen/driver/vagrant.rb
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ def check_vagrant_version
def check_berkshelf_plugin
if File.exists?(File.join(config[:kitchen_root], "Berksfile"))
plugins = silently_run("vagrant plugin list").split("\n")
if ! plugins.find { |p| p =~ /^berkshelf-vagrant\b/ }
raise UserError, "Detected a Berksfile but the berksfile-vagrant" +
if ! plugins.find { |p| p =~ /^vagrant-berkshelf\b/ }
raise UserError, "Detected a Berksfile but the vagrant-berkshelf" +
" plugin was not found in Vagrant. Please run:" +
" `vagrant plugin install berkshelf-vagrant' and retry."
" `vagrant plugin install vagrant-berkshelf' and retry."
end
end
end
Expand Down

0 comments on commit cce07f3

Please sign in to comment.