diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-20 05:56:43 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-20 05:56:43 +0000 |
| commit | db74541efec489c62310ab85091b28bb360e79c8 (patch) | |
| tree | 168c17fc9415c483722c7eb31ecdd63eac8771be /lib/rubygems/indexer.rb | |
| parent | cae4fb76dcc6810a38ad67301fb764b8b7e5c5ca (diff) | |
Update to RubyGems 0.9.5
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/indexer.rb')
| -rw-r--r-- | lib/rubygems/indexer.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb index 8cb7735c29..dc94f51b1a 100644 --- a/lib/rubygems/indexer.rb +++ b/lib/rubygems/indexer.rb @@ -60,16 +60,8 @@ class Gem::Indexer begin spec = Gem::Format.from_file_by_path(gemfile).spec - original_name = if spec.platform == Gem::Platform::RUBY or - spec.platform.nil? then - spec.full_name - else - "#{spec.name}-#{spec.version}-#{spec.original_platform}" - end - - unless gemfile =~ /\/#{Regexp.escape spec.full_name}.*\.gem\z/i or - gemfile =~ /\/#{Regexp.escape original_name}.*\.gem\z/i then - alert_warning "Skipping misnamed gem: #{gemfile} => #{spec.full_name} (#{original_name})" + unless gemfile =~ /\/#{Regexp.escape spec.original_name}.*\.gem\z/i then + alert_warning "Skipping misnamed gem: #{gemfile} => #{spec.full_name} (#{spec.original_name})" next end @@ -80,7 +72,7 @@ class Gem::Indexer @quick_index.add spec @marshal_index.add spec - progress.updated spec.full_name + progress.updated spec.original_name rescue SignalException => e alert_error "Recieved signal, exiting" |