Skip to content

Commit

Permalink
Merge pull request #16 from martinisoft/fix_berkshelf_detection
Browse files Browse the repository at this point in the history
Update Berkshelf plugin detection
  • Loading branch information
fnichol committed Apr 19, 2013
2 parents fecb098 + cce07f3 commit 46abe9a
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 @@ -152,10 +152,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 46abe9a

Please sign in to comment.