drbrain	2013-12-13 10:04:36 +0900 (Fri, 13 Dec 2013)

  New Revision: 44159

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44159

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/request_set/lockfile.rb
    trunk/test/rubygems/test_gem_request_set_lockfile.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44158)
+++ ChangeLog	(revision 44159)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Dec 13 10:04:23 2013  Eric Hodel  <drbrain@s...>
+
+	* 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@s...>
 
 	* lib/rubygems:  Update to RubyGems master ddac51f.  Changes:
Index: lib/rubygems/request_set/lockfile.rb
===================================================================
--- lib/rubygems/request_set/lockfile.rb	(revision 44158)
+++ lib/rubygems/request_set/lockfile.rb	(revision 44159)
@@ -448,7 +448,7 @@ class Gem::RequestSet::Lockfile https://github.com/ruby/ruby/blob/trunk/lib/rubygems/request_set/lockfile.rb#L448
   # Peeks at the next token for Lockfile
 
   def peek # :nodoc:
-    @tokens.first || :EOF
+    @tokens.first || [:EOF]
   end
 
   def skip type # :nodoc:
Index: test/rubygems/test_gem_request_set_lockfile.rb
===================================================================
--- test/rubygems/test_gem_request_set_lockfile.rb	(revision 44158)
+++ test/rubygems/test_gem_request_set_lockfile.rb	(revision 44159)
@@ -269,7 +269,7 @@ DEPENDENCIES https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_request_set_lockfile.rb#L269
 
     assert_equal :token, @lockfile.get
 
-    assert_equal :EOF, @lockfile.peek
+    assert_equal [:EOF], @lockfile.peek
   end
 
   def test_skip

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/