Force strict dependencies for default gems
When resolving for a plugin while within the installer, force strict dependencies for all the default gems to prevent the resolver from generating solutions where it may attempt to upgrade any of them. If running within bundler, retain the same behavior and ignore them.
This commit is contained in:
parent
1f7c959938
commit
f7185bcd02
@ -523,10 +523,20 @@ module Vagrant
|
|||||||
if Vagrant.strict_dependency_enforcement
|
if Vagrant.strict_dependency_enforcement
|
||||||
@logger.debug("Enabling strict dependency enforcement")
|
@logger.debug("Enabling strict dependency enforcement")
|
||||||
plugin_deps += vagrant_internal_specs.map do |spec|
|
plugin_deps += vagrant_internal_specs.map do |spec|
|
||||||
next if system_plugins.include?(spec.name)
|
# NOTE: When working within bundler, skip any system plugins and
|
||||||
# If this spec is for a default plugin included in
|
# default gems. However, when not within bundler (in the installer)
|
||||||
# the ruby stdlib, ignore it
|
# include them as strict dependencies to prevent the resolver from
|
||||||
next if spec.default_gem?
|
# attempting to create a solution with a newer version. The request
|
||||||
|
# set does allow for resolving conservatively but it can't be set
|
||||||
|
# from the public API (requires an instance variable set on the resolver
|
||||||
|
# instance) so strict dependencies are used instead.
|
||||||
|
if Vagrant.in_bundler?
|
||||||
|
next if system_plugins.include?(spec.name)
|
||||||
|
# # If this spec is for a default plugin included in
|
||||||
|
# # the ruby stdlib, ignore it
|
||||||
|
next if spec.default_gem?
|
||||||
|
end
|
||||||
|
|
||||||
# If we are not running within the installer and
|
# If we are not running within the installer and
|
||||||
# we are not within a bundler environment then we
|
# we are not within a bundler environment then we
|
||||||
# only want activated specs
|
# only want activated specs
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user