diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-09 09:18:47 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-09 09:18:47 +0000 |
commit | 5e262e5277d92dda1275035a2fbbea56377e13ff (patch) | |
tree | 0c8c726a61f8991f5273f2305d0db81bdde5a3e4 /lib/rubygems | |
parent | 40f304e025dbaeb954e2c324836ab4cf23f12053 (diff) |
* lib/rubygems/stub_specification.rb (Gem::StubSpecification#data):
should not change the value of $. when `require`ing gems.
this fixed test failures introduced by r51813.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems')
-rw-r--r-- | lib/rubygems/stub_specification.rb | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/lib/rubygems/stub_specification.rb b/lib/rubygems/stub_specification.rb index ed07e8011f..bb59077ca2 100644 --- a/lib/rubygems/stub_specification.rb +++ b/lib/rubygems/stub_specification.rb @@ -73,18 +73,23 @@ class Gem::StubSpecification < Gem::BasicSpecification unless @data @extensions = [] - open loaded_from, OPEN_MODE do |file| - begin - file.readline # discard encoding line - stubline = file.readline.chomp - if stubline.start_with?(PREFIX) then - @data = StubLine.new stubline - - @extensions = $'.split "\0" if - /\A#{PREFIX}/ =~ file.readline.chomp + begin + saved_lineno = $. + open loaded_from, OPEN_MODE do |file| + begin + file.readline # discard encoding line + stubline = file.readline.chomp + if stubline.start_with?(PREFIX) then + @data = StubLine.new stubline + + @extensions = $'.split "\0" if + /\A#{PREFIX}/ =~ file.readline.chomp + end + rescue EOFError end - rescue EOFError end + ensure + $. = saved_lineno end end |