mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Merge bundler-2.2.0.rc.2
This commit is contained in:
parent
7ffd14a18c
commit
d386a58f6f
Notes:
git
2020-10-15 17:19:31 +09:00
200 changed files with 1058 additions and 3672 deletions
|
@ -125,7 +125,7 @@ module Bundler
|
|||
@expanded_original_path ||= expand(original_path)
|
||||
end
|
||||
|
||||
private
|
||||
private
|
||||
|
||||
def expanded_path
|
||||
@expanded_path ||= expand(path)
|
||||
|
@ -171,7 +171,7 @@ module Bundler
|
|||
|
||||
if File.directory?(expanded_path)
|
||||
# We sort depth-first since `<<` will override the earlier-found specs
|
||||
Dir["#{expanded_path}/#{@glob}"].sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
|
||||
Gem::Util.glob_files_in_dir(@glob, expanded_path).sort_by {|p| -p.split(File::SEPARATOR).size }.each do |file|
|
||||
next unless spec = load_gemspec(file)
|
||||
spec.source = self
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue