Skip to content

Commit 6691d49

Browse files
committed
Remove local RubyGems patch now that Dir.glob supports the base keyword.
1 parent 5f71f7f commit 6691d49

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lib/mri/rubygems/util.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,11 @@ def self.traverse_parents(directory, &block)
121121
# returning absolute paths to the matching files.
122122

123123
def self.glob_files_in_dir(glob, base_path)
124-
# TruffleRuby bug doesn't support base:, and gem tests remove RUBY_ENGINE
125-
#if RUBY_VERSION >= "2.5"
126-
# Dir.glob(glob, base: base_path).map! {|f| File.expand_path(f, base_path) }
127-
#else
124+
if RUBY_VERSION >= "2.5"
125+
Dir.glob(glob, base: base_path).map! {|f| File.expand_path(f, base_path) }
126+
else
128127
Dir.glob(File.expand_path(glob, base_path))
129-
#end
128+
end
130129
end
131130

132131
end

0 commit comments

Comments
 (0)