diff options
author | danielsdeleo <dan@getchef.com> | 2014-09-02 15:20:56 -0700 |
---|---|---|
committer | danielsdeleo <dan@getchef.com> | 2014-09-03 12:44:46 -0700 |
commit | ae7d23c48b9d93b0e10789eb3f0e307a18351d99 (patch) | |
tree | c0a9f5208a641069640473e1c9879573ecc56180 /lib/chef/config.rb | |
parent | b4145b8ea22c91d22fc66fd585e36e1a415ede38 (diff) | |
download | chef-ae7d23c48b9d93b0e10789eb3f0e307a18351d99.tar.gz |
Remove config file jail, replaced with config skip option
Diffstat (limited to 'lib/chef/config.rb')
-rw-r--r-- | lib/chef/config.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/chef/config.rb b/lib/chef/config.rb index e8a9839d71..4e71645dcc 100644 --- a/lib/chef/config.rb +++ b/lib/chef/config.rb @@ -87,10 +87,6 @@ class Chef end end - # No config file (client.rb / knife.rb / etc.) will be loaded outside this path. - # Major use case is tests, where we don't want to load the user's config files. - configurable(:config_file_jail) - default :formatters, [] # Override the config dispatch to set the value of multiple server options simultaneously @@ -527,7 +523,7 @@ class Chef end def self.windows_home_path - windows_home_path = env['SYSTEMDRIVE'] + env['HOMEPATH'] if env['SYSTEMDRIVE'] && env['HOMEPATH'] + env['SYSTEMDRIVE'] + env['HOMEPATH'] if env['SYSTEMDRIVE'] && env['HOMEPATH'] end # returns a platform specific path to the user home dir if set, otherwise default to current directory. |