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

Merge pull request #11099 from briancain/file-provisioner-source-path 

Ensure relative path for file provisioner is relative to machines cwd
This commit is contained in:
Brian Cain 2019-10-07 14:28:13 -07:00 committed by GitHub
parent af405b03c9 0a6c4e2d0f
commit d6f556c83d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/file/provisioner.rb
View File

@ -3,7 +3,7 @@ module VagrantPlugins
class Provisioner < Vagrant.plugin("2", :provisioner) class Provisioner < Vagrant.plugin("2", :provisioner)
def provision def provision
@machine.communicate.tap do |comm| @machine.communicate.tap do |comm|
source = File.expand_path(config.source) source = File.expand_path(config.source, @machine.env.cwd)
destination = expand_guest_path(config.destination) destination = expand_guest_path(config.destination)
# If the source is a directory determine if any path modifications # If the source is a directory determine if any path modifications

2
test/unit/plugins/provisioners/file/provisioner_test.rb
View File

@ -65,7 +65,7 @@ describe VagrantPlugins::FileUpload::Provisioner do
allow(config).to receive(:destination).and_return("/foo/bar") allow(config).to receive(:destination).and_return("/foo/bar")
expect(communicator).to receive(:upload).with( expect(communicator).to receive(:upload).with(
File.expand_path("source"), "/foo/bar") File.expand_path("#{machine.env.cwd}/source"), "/foo/bar")
subject.provision subject.provision
end end