From e26d0e605c3d274531433ce6bfd9ee0f5077b0a3 Mon Sep 17 00:00:00 2001 From: hsbt Date: Fri, 20 Oct 2017 09:03:37 +0000 Subject: Merge rubygems master(ddbf3203f3857649abe95c73edefc7de7e6ecff4). It fixed: https://github.com/rubygems/rubygems/issues/2041 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/basic_specification.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/rubygems') diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb index 0d50a93230..72954a7863 100644 --- a/lib/rubygems/basic_specification.rb +++ b/lib/rubygems/basic_specification.rb @@ -275,10 +275,14 @@ class Gem::BasicSpecification # for this spec. def lib_dirs_glob - dirs = if self.raw_require_paths.size > 1 then - "{#{self.raw_require_paths.join(',')}}" + dirs = if self.raw_require_paths + if self.raw_require_paths.size > 1 then + "{#{self.raw_require_paths.join(',')}}" + else + self.raw_require_paths.first + end else - self.raw_require_paths.first + "lib" # default value for require_paths for bundler/inline end "#{self.full_gem_path}/#{dirs}".dup.untaint -- cgit v1.2.3