components/ruby/ruby-23/patches/03-Revert-Allow-installing-a-gem-inside-a-rescue-block.patch

   1 From e581b423e7e0df1dc1615d7b35ac17475b2c51d5 Mon Sep 17 00:00:00 2001
   2 From: Alexander Pyhalov <apyhalov@gmail.com>
   3 Date: Wed, 30 Nov 2016 16:09:17 +0300
   4 Subject: [PATCH] Revert "Allow installing a gem inside a rescue block"
   5
   6 This reverts commit ae4b5336efe559b83d7ccd06ffca46f70c6e948e.
   7
   8 This commit breaks documentation generation when install-dir is used
   9
  10 https://github.com/rubygems/rubygems/issues/1470
  11 ---
  12  lib/rubygems/request_set.rb | 5 +++--
  13  1 file changed, 3 insertions(+), 2 deletions(-)
  14
  15 diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb
  16 index 95a8eed..fa5ab1f 100644
  17 --- a/lib/rubygems/request_set.rb
  18 +++ b/lib/rubygems/request_set.rb
  19 @@ -187,6 +187,9 @@ class Gem::RequestSet
  20        requests << spec
  21      end
  22
  23 +    requests
  24 +  ensure
  25 +    raise if $!
  26      return requests if options[:gemdeps]
  27
  28      specs = requests.map do |request|
  29 @@ -205,8 +208,6 @@ class Gem::RequestSet
  30      Gem.done_installing_hooks.each do |hook|
  31        hook.call inst, specs
  32      end unless Gem.done_installing_hooks.empty?
  33 -
  34 -    requests
  35    end
  36
  37    ##
  38 --
  39 2.9.2
  40