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

VAGRANT_DOTFILE_PATH [GH-1524]

This commit is contained in:
Mitchell Hashimoto 2013-07-18 11:58:11 -04:00
parent cbf1417964
commit bd378ea2b0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -7,6 +7,8 @@ IMPROVEMENTS:
- Puppet will run without color if the UI is not colored. [GH-1344] - Puppet will run without color if the UI is not colored. [GH-1344]
- Chef supports the "formatter" configuration for setting the - Chef supports the "formatter" configuration for setting the
formatter. [GH-1250] formatter. [GH-1250]
- VAGRANT_DOTFILE_PATH environmental variable reintroduces the
functionality removed in 1.1 from "config.dotfile_name" [GH-1524]
BUG FIXES: BUG FIXES:

5
lib/vagrant/environment.rb
View File

@ -117,11 +117,10 @@ module Vagrant
# Setup the local data directory. If a configuration path is given, # Setup the local data directory. If a configuration path is given,
# then it is expanded relative to the working directory. Otherwise, # then it is expanded relative to the working directory. Otherwise,
# we use the default which is expanded relative to the root path. # we use the default which is expanded relative to the root path.
@local_data_path = nil opts[:local_data_path] ||= ENV["VAGRANT_DOTFILE_PATH"]
opts[:local_data_path] ||= root_path.join(DEFAULT_LOCAL_DATA) if !root_path.nil?
if opts[:local_data_path] if opts[:local_data_path]
@local_data_path = Pathname.new(File.expand_path(opts[:local_data_path], @cwd)) @local_data_path = Pathname.new(File.expand_path(opts[:local_data_path], @cwd))
elsif !root_path.nil?
@local_data_path = root_path.join(DEFAULT_LOCAL_DATA)
end end
setup_local_data_path setup_local_data_path