wait to validate so git gems always have sources

rubygems · Feb 18, 2016 · 4cad30f · 4cad30f
1 parent 761e30f
commit 4cad30f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/bundler/source/path.rb b/lib/bundler/source/path.rb
@@ -135,9 +135,12 @@ def load_spec_files
         if File.directory?(expanded_path)
           # We sort depth-first since `<<` will override the earlier-found specs
           Dir["#{expanded_path}/#{@glob}"].sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
-            next unless spec = Bundler.load_gemspec(file, :validate)
+            next unless spec = Bundler.load_gemspec(file)
             spec.loaded_from = file.to_s
             spec.source = self
+            # Validation causes extension_dir to be calculated, which depends
+            # on #source, so we validate here instead of load_gemspec
+            Bundler.rubygems.validate(spec)
             index << spec
           end