diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-04-27 18:16:31 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-04-27 18:16:31 -0700 |
| commit | 01fc4a03c3cb909dd1045690f8b81256ce9bd6fa (patch) | |
| tree | 15675f0e9c20347b9df739cd98dad6219d017c46 | |
| parent | 87eb4537b3502da5b7ba95ada4fbe91f11e3311f (diff) | |
| download | chef-lcg/support-unbundled-rake.tar.gz | |
Fixes to support unbundled rake uselcg/support-unbundled-rake
We're using Bundler::GemHelper without requiring it
We're requiring `lib/chef/dist.rb` which requires files out
of `chef-config/lib/chef-config` which will escape into the
main fileset if we don't push that libdir on there.
(Also: all of `lib/chef/dist.rb` and
`chef-config/lib/chef-config/dist.rb` needs to be pushed into
chef-utils and reading values into `lib/chef/dist.rb` from
the Chef::Config itself seems like the wrong flow of information)
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | Rakefile | 5 | ||||
| -rw-r--r-- | chef-bin/Rakefile | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -17,6 +17,9 @@ # limitations under the License. # +# we need this to resolve files required by lib/chef/dist +$LOAD_PATH.unshift(File.expand_path("../chef-config/lib", __FILE__)) + begin require_relative "tasks/rspec" require_relative "tasks/dependencies" @@ -27,6 +30,8 @@ rescue LoadError => e puts "Skipping missing rake dep: #{e}" end +require "bundler/gem_helper" + ENV["CHEF_LICENSE"] = "accept-no-persist" # hack the chef-config install to run before the traditional install task diff --git a/chef-bin/Rakefile b/chef-bin/Rakefile index 5626d1bc5d..5e5c9bbf5f 100644 --- a/chef-bin/Rakefile +++ b/chef-bin/Rakefile @@ -1,6 +1,8 @@ # we need to force the install in order to overwrite the binstubs from # old chef gems. +require "bundler/gem_helper" + Bundler::GemHelper.install_tasks # this is necessary to use to overwrite any chef-14 or earlier era gem which has the bin files in |