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

kernel/v2: not an error if synced folder guest path is empty [GH-4833]

This commit is contained in:
Mitchell Hashimoto 2015-07-06 14:58:48 -06:00
parent 79115d1ccc
commit f5e38a4a14
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kernel_v2/config/vm.rb
View File

@ -603,6 +603,7 @@ module VagrantPlugins
guestpath = Pathname.new(options[:guestpath]) guestpath = Pathname.new(options[:guestpath])
hostpath = Pathname.new(options[:hostpath]).expand_path(machine.env.root_path) hostpath = Pathname.new(options[:hostpath]).expand_path(machine.env.root_path)
if guestpath.to_s != ""
if guestpath.relative? && guestpath.to_s !~ /^\w+:/ if guestpath.relative? && guestpath.to_s !~ /^\w+:/
errors << I18n.t("vagrant.config.vm.shared_folder_guestpath_relative", errors << I18n.t("vagrant.config.vm.shared_folder_guestpath_relative",
path: options[:guestpath]) path: options[:guestpath])
@ -614,6 +615,7 @@ module VagrantPlugins
used_guest_paths.add(options[:guestpath]) used_guest_paths.add(options[:guestpath])
end end
end
if !hostpath.directory? && !options[:create] if !hostpath.directory? && !options[:create]
errors << I18n.t("vagrant.config.vm.shared_folder_hostpath_missing", errors << I18n.t("vagrant.config.vm.shared_folder_hostpath_missing",

6
test/unit/plugins/kernel_v2/config/vm_test.rb
View File

@ -480,6 +480,12 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
expect(sf["/vagrant"][:disabled]).to be_false expect(sf["/vagrant"][:disabled]).to be_false
expect(sf["/vagrant"][:foo]).to eq(:bar) expect(sf["/vagrant"][:foo]).to eq(:bar)
end end
it "is not an error if guest path is empty" do
subject.synced_folder(".", "")
subject.finalize!
assert_valid
end
end end
describe "#usable_port_range" do describe "#usable_port_range" do