haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow prerelease matches on vagrant spec when running instance is prerelease

This commit is contained in:
Chris Roberts 2017-03-07 10:36:35 -08:00
parent abf38106c0
commit 7610ecfcba
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vagrant/bundler.rb
View File

@ -280,7 +280,10 @@ module Vagrant
# as we know the dependencies are satisfied and it will attempt to validate a gem's # as we know the dependencies are satisfied and it will attempt to validate a gem's
# dependencies are satisified by gems in the install directory (which will likely not # dependencies are satisified by gems in the install directory (which will likely not
# be true) # be true)
result = request_set.install_into(plugin_gem_path.to_s, true, ignore_dependencies: true) result = request_set.install_into(plugin_gem_path.to_s, true,
ignore_dependencies: true,
prerelease: Vagrant.prerelease?
)
result = result.map(&:full_spec) result = result.map(&:full_spec)
result result
end end
@ -425,7 +428,8 @@ module Vagrant
def find_all(req) def find_all(req)
@specs.select do |spec| @specs.select do |spec|
req.match?(spec) allow_prerelease = spec.name == "vagrant" && Vagrant.prerelease?
req.match?(spec, allow_prerelease)
end.map do |spec| end.map do |spec|
Gem::Resolver::InstalledSpecification.new(self, spec) Gem::Resolver::InstalledSpecification.new(self, spec)
end end
@ -474,7 +478,7 @@ module Vagrant
# ignored. # ignored.
def load_spec (name, version, platform, source) def load_spec (name, version, platform, source)
version = Gem::Version.new(version) if !version.is_a?(Gem::Version) version = Gem::Version.new(version) if !version.is_a?(Gem::Version)
@specs.fetch(name, []).detect{|s| s.name == name && s.version = version} @specs.fetch(name, []).detect{|s| s.name == name && s.version == version}
end end
end end
end end