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

Use File.join instead of File.expand_path in chef solo provisioner for folder paths. Allows it work on windows again.

This commit is contained in:
Mitchell Hashimoto 2010-08-18 11:40:49 -07:00
parent 8f9bb0c9b3
commit 3c225ee768
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,7 @@
## 0.5.3 (unreleased) ## 0.5.3 (unreleased)
- Fixed chef solo provision to work on Windows. It was expanding a linux
path which prepended a drive letter onto it.
## 0.5.2 (August 3, 2010) ## 0.5.2 (August 3, 2010)

2
Gemfile.lock
View File

@ -27,7 +27,7 @@ GEM
mario (0.0.6) mario (0.0.6)
mocha (0.9.8) mocha (0.9.8)
rake rake
net-scp (1.0.2) net-scp (1.0.3)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.0.23) net-ssh (2.0.23)
rake (0.8.7) rake (0.8.7)

2
lib/vagrant/provisioners/chef_solo.rb
View File

@ -64,7 +64,7 @@ module Vagrant
end end
def folder_path(*args) def folder_path(*args)
File.expand_path(args.join("-"), env.config.chef.provisioning_path) File.join(env.config.chef.provisioning_path, args.join("-"))
end end
def folders_path(folders, folder) def folders_path(folders, folder)