Chef-solo recipe_url works properly again [GH-1467]

This commit is contained in:
Mitchell Hashimoto 2013-03-20 22:20:19 -07:00
parent fc8a5923b7
commit 78d05e73d7
2 changed files with 6 additions and 2 deletions

View File

@ -10,6 +10,7 @@ BUG FIXES:
- Attempt to re-establish SSH connection on `Net::SSH::Disconnect`
- Allow any value that can convert to a string for `Vagrant.plugin`
- Chef solo `recipe_url` works properly again. [GH-1467]
## 1.1.2 (March 18, 2013)

View File

@ -27,8 +27,12 @@ module VagrantPlugins
end
def finalize!
@recipe_url = nil if @recipe_url == UNSET_VALUE
if @cookbooks_path == UNSET_VALUE
@cookbooks_path = [[:host, "cookbooks"], [:vm, "cookbooks"]]
@cookbooks_path = []
@cookbooks_path << [:host, "cookbooks"] if !@recipe_url
@cookbooks_path << [:vm, "cookbooks"]
@__defaulted_cookbooks_path = true
end
@ -45,7 +49,6 @@ module VagrantPlugins
@encrypted_data_bag_secret_key_path = nil if \
@encrypted_data_bag_secret_key_path == UNSET_VALUE
@nfs = false if @nfs == UNSET_VALUE
@recipe_url = nil if @recipe_url == UNSET_VALUE
end
def validate(machine)