You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

36 lines
952 B

  1. References:
  2. https://github.com/rdoc/rdoc/pull/340
  3. --- ruby-2.1.2.orig/lib/rdoc.rb 2014-09-02 17:14:28.719224215 -0300
  4. +++ ruby-2.1.2/lib/rdoc.rb 2014-09-02 17:14:28.762223911 -0300
  5. @@ -109,6 +109,8 @@
  6. def self.load_yaml
  7. begin
  8. gem 'psych'
  9. + rescue NameError => e # --disable-gems
  10. + raise unless e.name == :gem
  11. rescue Gem::LoadError
  12. end
  13. --- ruby-2.1.2.orig/lib/rdoc/markdown.rb 2014-09-02 17:14:28.761223918 -0300
  14. +++ ruby-2.1.2/lib/rdoc/markdown.rb 2014-09-02 17:14:28.805223607 -0300
  15. @@ -525,7 +525,6 @@
  16. - require 'rubygems'
  17. require 'rdoc'
  18. require 'rdoc/markup/to_joined_paragraph'
  19. require 'rdoc/markdown/entities'
  20. --- ruby-2.1.2.orig/lib/rdoc/text.rb 2014-09-02 17:14:28.721224201 -0300
  21. +++ ruby-2.1.2/lib/rdoc/text.rb 2014-09-02 17:14:28.764223897 -0300
  22. @@ -10,6 +10,8 @@
  23. begin
  24. gem 'json'
  25. +rescue NameError => e # --disable-gems
  26. + raise unless e.name == :gem
  27. rescue Gem::LoadError
  28. end