diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-01 15:47:30 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-09 09:16:06 -0800 |
| commit | aa74c0ac58393e9186c2ebecbc3144c2c8d2ee85 (patch) | |
| tree | 13a59b98b8c643e9bfe3b0a0958ddc396d609f46 /lib/chef/policy_builder | |
| parent | 99ea57ca5bdd46902855a7cd80b86d24d3371486 (diff) | |
| download | chef-aa74c0ac58393e9186c2ebecbc3144c2c8d2ee85.tar.gz | |
get the formatting for cookbook gems correct
this leverages the PR:
https://github.com/bundler/bundler/pull/4245
to redirect output from bundler into chef's logger/formatter to get the
UI right. if you don't have that in the external bundler you'll just
get output on STDOUT. fix is to upgrade bundler.
Diffstat (limited to 'lib/chef/policy_builder')
| -rw-r--r-- | lib/chef/policy_builder/expand_node_object.rb | 6 | ||||
| -rw-r--r-- | lib/chef/policy_builder/policyfile.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/policy_builder/expand_node_object.rb b/lib/chef/policy_builder/expand_node_object.rb index e3d136684b..de6d7ccee3 100644 --- a/lib/chef/policy_builder/expand_node_object.rb +++ b/lib/chef/policy_builder/expand_node_object.rb @@ -3,7 +3,7 @@ # Author:: Tim Hinderliter (<tim@chef.io>) # Author:: Christopher Walters (<cw@chef.io>) # Author:: Daniel DeLeo (<dan@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -75,7 +75,7 @@ class Chef cl.load_cookbooks cookbook_collection = Chef::CookbookCollection.new(cl) cookbook_collection.validate! - cookbook_collection.install_gems + cookbook_collection.install_gems(events) run_context = Chef::RunContext.new(node, cookbook_collection, @events) else @@ -83,7 +83,7 @@ class Chef cookbook_hash = sync_cookbooks cookbook_collection = Chef::CookbookCollection.new(cookbook_hash) cookbook_collection.validate! - cookbook_collection.install_gems + cookbook_collection.install_gems(events) run_context = Chef::RunContext.new(node, cookbook_collection, @events) end diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb index 12268d426a..af6c0da511 100644 --- a/lib/chef/policy_builder/policyfile.rb +++ b/lib/chef/policy_builder/policyfile.rb @@ -3,7 +3,7 @@ # Author:: Tim Hinderliter (<tim@chef.io>) # Author:: Christopher Walters (<cw@chef.io>) # Author:: Daniel DeLeo (<dan@chef.io>) -# Copyright:: Copyright 2008-2016, Chef Software, Inc. +# Copyright:: Copyright 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -153,7 +153,7 @@ class Chef sync_cookbooks cookbook_collection = Chef::CookbookCollection.new(cookbooks_to_sync) cookbook_collection.validate! - cookbook_collection.install_gems + cookbook_collection.install_gems(events) run_context = Chef::RunContext.new(node, cookbook_collection, events) |