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
This commit is contained in:
hsbt 2017-10-20 09:03:37 +00:00
parent 0242f7ccae
commit 43e320ba1b
3 changed files with 25 additions and 9 deletions

View file

@ -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