diff options
| author | Thom May <thom@may.lt> | 2018-02-21 09:53:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 09:53:56 +0000 |
| commit | 054b7dcad329138b6f153f73cf33a180021e79db (patch) | |
| tree | 291a517898941fed27d739d759453291f47f0a6d | |
| parent | 0125889022d79b031b5a461ab9411b0f4df07eed (diff) | |
| parent | 55cdc47879b6357b8da1b5c6349f0c23ddb83ba9 (diff) | |
| download | chef-054b7dcad329138b6f153f73cf33a180021e79db.tar.gz | |
Merge pull request #6871 from chef/tm/policyful_tarballs
Allow tarballs generated by chef export to be used
| -rw-r--r-- | lib/chef/application/client.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index 32530925d5..0834e5f037 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -345,6 +345,8 @@ class Chef::Application::Client < Chef::Application tarball_path = File.join(Chef::Config.chef_repo_path, "recipes.tgz") fetch_recipe_tarball(Chef::Config[:recipe_url], tarball_path) Mixlib::Archive.new(tarball_path).extract(Chef::Config.chef_repo_path, perms: false, ignore: /^\.$/) + config_path = File.join(Chef::Config.chef_repo_path, ".chef/config.rb") + Chef::Config.from_string(IO.read(config_path), config_path) if File.file?(config_path) end end |