summaryrefslogtreecommitdiff
path: root/lib/rubygems/util.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-23 00:20:49 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-23 00:20:49 +0000
commitae19a18996727954cba2da90ab816e2d5023822a (patch)
tree158b316a17cb6618235df3ce4cf27c6108240084 /lib/rubygems/util.rb
parent9b9fe826fd1ce825af3503f39643f75910307a51 (diff)
Merge RubyGems 3.0.1 from rubygems/rubygems.
It fixed the issues of RubyGems 3.0.0. https://blog.rubygems.org/2018/12/23/3.0.1-released.html git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/util.rb')
-rw-r--r--lib/rubygems/util.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rubygems/util.rb b/lib/rubygems/util.rb
index 60d552ddb3..b9e5dfc8c7 100644
--- a/lib/rubygems/util.rb
+++ b/lib/rubygems/util.rb
@@ -122,7 +122,7 @@ module Gem::Util
def self.glob_files_in_dir(glob, base_path)
if RUBY_VERSION >= "2.5"
- Dir.glob(glob, base: base_path).map! {|f| File.join(base_path, f) }
+ Dir.glob(glob, base: base_path).map! {|f| File.expand_path(f, base_path) }
else
Dir.glob(File.expand_path(glob, base_path))
end