diff options
| author | Lars Kanis <kanis@comcard.de> | 2020-01-09 15:33:23 +0100 |
|---|---|---|
| committer | Lars Kanis <kanis@comcard.de> | 2020-01-16 12:53:04 +0100 |
| commit | 394cd143f007e03db70d72c353bf5d3752139b21 (patch) | |
| tree | e395db8e83fdfaec5cf30861fd8902e59a39be74 /lib | |
| parent | d852b30b66165dbb88682f72a8929568af7e7c57 (diff) | |
| download | bundler-394cd143f007e03db70d72c353bf5d3752139b21.tar.gz | |
Reactivate usused code for ruby version resolution
The code was changed in commit 38b0e7ed64c3ca1c40f43c5aa9a1ead2f6cd7049 so that RubyVersion.system was no longer respected.
This is reactivated now and specs are adjusted accordingly.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 3e5186039a..efd7618194 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -860,8 +860,8 @@ module Bundler @metadata_dependencies ||= begin ruby_versions = concat_ruby_version_requirements(@ruby_version) if ruby_versions.empty? || !@ruby_version.exact? - concat_ruby_version_requirements(RubyVersion.system) - concat_ruby_version_requirements(locked_ruby_version_object) unless @unlock[:ruby] + concat_ruby_version_requirements(RubyVersion.system, ruby_versions) + concat_ruby_version_requirements(locked_ruby_version_object, ruby_versions) unless @unlock[:ruby] end [ Dependency.new("Ruby\0", ruby_versions), |