Permalink
Browse files

Revert "fix bundle cache again for rubygems 1.3.x"

This reverts commit bad23b5.

Conflicts:

	lib/bundler/rubygems_ext.rb
  • Loading branch information...
1 parent d8ec8ef commit 4a0697cc463dfaef9eeb5c5be8628d14558d2850 @hone hone committed Sep 12, 2011
Showing with 7 additions and 2 deletions.
  1. +7 −2 lib/bundler/rubygems_integration.rb
@@ -254,9 +254,14 @@ def replace_entrypoints(specs)
# by monkeypatching it into the method in Rubygems 1.3.6 and 1.3.7.
def backport_segment_generation
Gem::Version.send(:define_method, :segments) do
- @segments ||= @version.scan(/[0-9]+|[a-z]+/i).map do |s|
- /^\d+$/ =~ s ? s.to_i : s
+ @segments_generated ||= false
+ unless @segments_generated
+ @segments ||= @version.scan(/[0-9a-z]+/i).map do |s|
+ /^\d+$/ =~ s ? s.to_i : s
+ end
end
+ @segments_generated = true
+ @segments
end
end

0 comments on commit 4a0697c

Please sign in to comment.