From 0b94ed44b751e8e9b4b0cb47447a0cca417eea2b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 5 Sep 2013 14:25:38 -0700 Subject: [PATCH] core: dup the synced folder options [GH-2134] --- CHANGELOG.md | 3 +++ plugins/kernel_v2/config/vm.rb | 1 + plugins/provisioners/puppet/provisioner/puppet.rb | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2efa6710a..1640f2615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ## 1.3.1 (unreleased) +BUG FIXES: + - provisioners/puppet: No more "shared folders cannot be found" error. + [GH-2134] ## 1.3.0 (September 5, 2013) diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 26a3217cb..8d25556a1 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -138,6 +138,7 @@ module VagrantPlugins end options ||= {} + options = options.dup options[:guestpath] = guestpath.to_s.gsub(/\/$/, '') options[:hostpath] = hostpath diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 47ff35d5f..54bd25722 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -36,10 +36,8 @@ module VagrantPlugins @expanded_manifests_path, manifests_guest_path, folder_opts) # Share the module paths - count = 0 @module_paths.each do |from, to| root_config.vm.synced_folder(from, to, folder_opts) - count += 1 end end