Ignore "OSE" suffix when checking guest additions versions [closes GH-438]
This commit is contained in:
parent
2ca46ced57
commit
0e7ccf86bc
|
@ -3,6 +3,7 @@
|
|||
- Fix SSH `exec!` to inherit proper `$PATH`. [GH-426]
|
||||
- Chef client now accepts an empty (`nil`) run list again. [GH-429]
|
||||
- Fix incorrect error message when running `provision` on halted VM. [GH-447]
|
||||
- Checking guest addition versions now ignores OSE. [GH-438]
|
||||
|
||||
## 0.8.2 (July 22, 2011)
|
||||
|
||||
|
|
|
@ -15,10 +15,15 @@ module Vagrant
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue