From 762ddfaeb5e050112f5a78b30be4db1819d49670 Mon Sep 17 00:00:00 2001 From: James Wen Date: Thu, 14 Apr 2016 08:16:21 -0400 Subject: Prevent recursive `bundle package` loop with multiple gemspecs - Fixes #4430 --- lib/bundler/runtime.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/bundler/runtime.rb') diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb index d4a78370..a0abb750 100644 --- a/lib/bundler/runtime.rb +++ b/lib/bundler/runtime.rb @@ -127,16 +127,16 @@ module Bundler Bundler.ui.info "Updating files in #{Bundler.settings.app_cache_path}" - # Do not try to cache specification for the gem described by the .gemspec - root_gem_name = nil + # Do not try to cache specification for the gem described any of the gemspecs + root_gem_names = nil if gemspec_cache_hash = Bundler.instance_variable_get(:@gemspec_cache) - gemspec = gemspec_cache_hash.values.first - root_gem_name = gemspec.name unless gemspec.nil? + gemspecs = gemspec_cache_hash.values + root_gem_names = gemspecs.map(&:name) end specs.each do |spec| next if spec.name == "bundler" - next if !Dir.glob("*.gemspec").empty? && spec.source.class == Bundler::Source::Path && root_gem_name && spec.name == root_gem_name + next if !Dir.glob("*.gemspec").empty? && spec.source.class == Bundler::Source::Path && root_gem_names.include?(spec.name) spec.source.send(:fetch_gem, spec) if Bundler.settings[:cache_all_platforms] && spec.source.respond_to?(:fetch_gem, true) spec.source.cache(spec, custom_path) if spec.source.respond_to?(:cache) end -- cgit v1.2.3