From 81c757555c57f088e74b7c656ae703bea620b463 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Tue, 22 Oct 2019 20:03:04 -0400 Subject: [PATCH] Fix indirect gem overrides If a gem isn't directly referenced in the core-repo's gemfile it cannot be overridden, ensure_gem has to be used. Fixes https://github.com/ManageIQ/manageiq-cross_repo/issues/36 --- lib/manageiq/cross_repo/runner.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/manageiq/cross_repo/runner.rb b/lib/manageiq/cross_repo/runner.rb index de77c10..f9fd987 100644 --- a/lib/manageiq/cross_repo/runner.rb +++ b/lib/manageiq/cross_repo/runner.rb @@ -68,7 +68,7 @@ def generate_bundler_d if gem_repos.empty? FileUtils.rm_f override_path else - content = gem_repos.map { |gem| "override_gem \"#{gem.repo}\", :path => \"#{gem.path}\"" }.join("\n") + content = gem_repos.map { |gem| "ensure_gem \"#{gem.repo}\", :path => \"#{gem.path}\"" }.join("\n") FileUtils.mkdir_p(bundler_d_path) File.write(override_path, content)