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

Better checks, hopefully

This commit is contained in:
Carlos Rodrigues 2016-07-22 14:59:05 +01:00
parent 92104fec72
commit 9ebc028745
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vagrant/environment.rb
View File

@ -160,9 +160,13 @@ module Vagrant
# it is expanded relative to the root path or to the working directory
# depending on whether it starts with the "{}" placeholder. Otherwise,
# we use the default which is expanded relative to the root path.
opts[:local_data_path] ||= ENV["VAGRANT_DOTFILE_PATH"] if !opts[:child]
if opts[:local_data_path] && opts[:local_data_path].match("^\{\}") && !root_path.nil?
opts[:local_data_path] = File.join(root_path, opts[:local_data_path].sub(/^\{\}/, ''))
if ENV.has_key?("VAGRANT_DOTFILE_PATH") && !opts[:child]
dotfile_path = ENV["VAGRANT_DOTFILE_PATH"]
if dotfile_path.match(/^\{\}/) && !root_path.nil?
opts[:local_data_path] = File.join(root_path, dotfile_path.sub(/^\{\}/, ''))
else
opts[:local_data_path] = dotfile_path
end
end
opts[:local_data_path] ||= root_path.join(DEFAULT_LOCAL_DATA) if !root_path.nil?
if opts[:local_data_path]