mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rubygems/request_set/lockfile.rb: Import RubyGems master a8d0669
with a 1.8.7 compatibility fix. * test/rubygems/test_gem_request_set_lockfile.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
955a6258a3
commit
d35e7b5be2
3 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
|||
Fri Dec 13 10:04:23 2013 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib/rubygems/request_set/lockfile.rb: Import RubyGems master a8d0669
|
||||
with a 1.8.7 compatibility fix.
|
||||
* test/rubygems/test_gem_request_set_lockfile.rb: ditto.
|
||||
|
||||
Fri Dec 13 09:50:49 2013 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib/rubygems: Update to RubyGems master ddac51f. Changes:
|
||||
|
|
|
@ -448,7 +448,7 @@ class Gem::RequestSet::Lockfile
|
|||
# Peeks at the next token for Lockfile
|
||||
|
||||
def peek # :nodoc:
|
||||
@tokens.first || :EOF
|
||||
@tokens.first || [:EOF]
|
||||
end
|
||||
|
||||
def skip type # :nodoc:
|
||||
|
|
|
@ -269,7 +269,7 @@ DEPENDENCIES
|
|||
|
||||
assert_equal :token, @lockfile.get
|
||||
|
||||
assert_equal :EOF, @lockfile.peek
|
||||
assert_equal [:EOF], @lockfile.peek
|
||||
end
|
||||
|
||||
def test_skip
|
||||
|
|
Loading…
Add table
Reference in a new issue