From 8067d729473d2916ffad7d6dde939ca484a3d01b Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Fri, 19 Aug 2016 16:07:02 -0700
Subject: [PATCH] dont catch load error when loading grpc lib in grpc gem
---
src/ruby/lib/grpc/grpc.rb | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/ruby/lib/grpc/grpc.rb b/src/ruby/lib/grpc/grpc.rb
index eff84a47a6..71be174835 100644
--- a/src/ruby/lib/grpc/grpc.rb
+++ b/src/ruby/lib/grpc/grpc.rb
@@ -28,8 +28,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
begin
- RUBY_VERSION =~ /(\d+\.\d+)/
- require_relative "#{$1}/grpc_c"
-rescue LoadError
- require_relative 'grpc_c'
+ ruby_version_dirname = /(\d+\.\d+)/.match(RUBY_VERSION)
+ distrib_lib_dir = File.expand_path("#{ruby_version_dirname}/grpc_c",
+ File.dirname(__FILE__))
+ if File.directory?(distrib_lib_dir)
+ require_relative "#{distrib_lib_dir}/grpc_c"
+ else
+ require_relative 'grpc_c'
+ end
end
--
GitLab