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

Only check non-OSE versions for checking guest addition versions [GH-514]

This commit is contained in:
Mitchell Hashimoto 2011-11-30 12:46:13 -08:00
parent 27c4d61e67
commit c1a0b97067
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vagrant/action/vm/check_guest_additions.rb
View File

@ -16,10 +16,13 @@ module Vagrant
if version.empty? if version.empty?
env.ui.warn I18n.t("vagrant.actions.vm.check_guest_additions.not_detected") env.ui.warn I18n.t("vagrant.actions.vm.check_guest_additions.not_detected")
else else
# Strip the -OSE/_OSE off from the guest additions # Strip the -OSE/_OSE off from the guest additions and the virtual box
version = version.gsub(/[-_]ose/i, '') # version since all the matters are that the version _numbers_ match up.
guest_version, vb_version = [version, VirtualBox.version].map do |v|
v.gsub(/[-_]ose/i, '')
end
if version != VirtualBox.version if guest_version != vb_version
env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch", env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch",
:guest_version => version, :guest_version => version,
:virtualbox_version => VirtualBox.version)) :virtualbox_version => VirtualBox.version))