diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-20 09:03:37 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-20 09:03:37 +0000 |
| commit | 43e320ba1b08c32286f0aa1972528c5f25b4a483 (patch) | |
| tree | de7fdcc12d7625ee8c7e25ffd73a015c651104a5 /lib | |
| parent | 0242f7ccae800eab5c3ab5f3129b1126ffbb45c3 (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/basic_specification.rb | 10 |
1 files changed, 7 insertions, 3 deletions
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 |