diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 00:14:16 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 00:14:16 +0000 |
commit | 28918eac58eb6e2681d10839ac0d1430b2a4f1f9 (patch) | |
tree | 3c2c9e36118efe1d9406acdd14c186788879bea3 /lib/rubygems/indexer.rb | |
parent | cfe1458078b8cf36e490c516977c52e1faa9e88a (diff) | |
download | ruby-28918eac58eb6e2681d10839ac0d1430b2a4f1f9.tar.gz |
* lib/rubygems: Update to RubyGems master commit 2a74263. This fixes
several bugs in RubyGems 2.2.0.preview.1.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/indexer.rb')
-rw-r--r-- | lib/rubygems/indexer.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb index 85c90f7d78..1c7f8e709f 100644 --- a/lib/rubygems/indexer.rb +++ b/lib/rubygems/indexer.rb @@ -126,7 +126,7 @@ class Gem::Indexer # Builds Marshal quick index gemspecs. def build_marshal_gemspecs - count = Gem::Specification.count + count = Gem::Specification.count { |s| not s.default_gem? } progress = ui.progress_reporter count, "Generating Marshal quick index gemspecs for #{count} gems", "Complete" @@ -135,6 +135,7 @@ class Gem::Indexer Gem.time 'Generated Marshal quick index gemspecs' do Gem::Specification.each do |spec| + next if spec.default_gem? spec_file_name = "#{spec.original_name}.gemspec.rz" marshal_name = File.join @quick_marshal_dir, spec_file_name @@ -188,10 +189,13 @@ class Gem::Indexer # Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease def build_modern_indicies - prerelease, released = Gem::Specification.partition { |s| + specs = Gem::Specification.reject { |s| s.default_gem? } + + prerelease, released = specs.partition { |s| s.version.prerelease? } - latest_specs = Gem::Specification.latest_specs + latest_specs = + Gem::Specification.latest_specs.reject { |s| s.default_gem? } build_modern_index(released.sort, @specs_index, 'specs') build_modern_index(latest_specs.sort, @latest_specs_index, 'latest specs') |