lib/vagrant/action/vm/check_guest_additions.rb in vagrantup-0.8.2 vs lib/vagrant/action/vm/check_guest_additions.rb in vagrantup-0.8.3
- old
+ new
@@ -13,13 +13,18 @@
# Use the raw interface for now, while the virtualbox gem
# doesn't support guest properties (due to cross platform issues)
version = env["vm"].vm.interface.get_guest_property_value("/VirtualBox/GuestAdd/Version")
if version.empty?
env.ui.warn I18n.t("vagrant.actions.vm.check_guest_additions.not_detected")
- elsif version != VirtualBox.version
- env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch",
- :guest_version => version,
- :virtualbox_version => VirtualBox.version))
+ else
+ # Strip the -OSE/_OSE off from the guest additions
+ version = version.gsub(/[-_]ose/i, '')
+
+ if version != VirtualBox.version
+ env.ui.warn(I18n.t("vagrant.actions.vm.check_guest_additions.version_mismatch",
+ :guest_version => version,
+ :virtualbox_version => VirtualBox.version))
+ end
end
# Continue
@app.call(env)
end