From c5b3751a83f81927ec688dfa77e178864fb96a2c Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 19 Jun 2017 14:04:57 -0700 Subject: [PATCH] Properly handle exception raised when property does not exist --- plugins/providers/virtualbox/driver/version_4_3.rb | 8 ++++++-- plugins/providers/virtualbox/driver/version_5_0.rb | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/providers/virtualbox/driver/version_4_3.rb b/plugins/providers/virtualbox/driver/version_4_3.rb index b9b3badb4..4f2caccf8 100644 --- a/plugins/providers/virtualbox/driver/version_4_3.rb +++ b/plugins/providers/virtualbox/driver/version_4_3.rb @@ -609,10 +609,14 @@ module VagrantPlugins end def share_folders(folders) - guestOS = read_guest_property("/VirtualBox/GuestInfo/OS/Product") + is_solaris = begin + "SunOS" == read_guest_property("/VirtualBox/GuestInfo/OS/Product") + rescue + false + end folders.each do |folder| hostpath = folder[:hostpath] - if Vagrant::Util::Platform.windows? && guestOS != "SunOS" + if Vagrant::Util::Platform.windows? && is_solaris hostpath = Vagrant::Util::Platform.windows_unc_path(hostpath) end args = ["--name", diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb index 3c01adce7..7c5b9f16f 100644 --- a/plugins/providers/virtualbox/driver/version_5_0.rb +++ b/plugins/providers/virtualbox/driver/version_5_0.rb @@ -613,11 +613,15 @@ module VagrantPlugins end def share_folders(folders) - guestOS = read_guest_property("/VirtualBox/GuestInfo/OS/Product") + is_solaris = begin + "SunOS" == read_guest_property("/VirtualBox/GuestInfo/OS/Product") + rescue + false + end folders.each do |folder| # NOTE: Guest additions on Solaris guests do not properly handle # UNC style paths so prevent conversion (See GH-7264) - if guestOS == "SunOS" + if is_solaris hostpath = folder[:hostpath] else hostpath = Vagrant::Util::Platform.windows_path(folder[:hostpath])