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

Use util methods in vagrant bin for experimental flag

This commit is contained in:
Brian Cain 2018-12-07 10:27:47 -08:00
parent 44fa134c48
commit 611e3dce96
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/vagrant
View File

@ -89,6 +89,7 @@ begin
require 'vagrant/bundler' require 'vagrant/bundler'
require 'vagrant/cli' require 'vagrant/cli'
require 'vagrant/util/platform' require 'vagrant/util/platform'
require 'vagrant/util/experimental'
# Schedule the cleanup of things # Schedule the cleanup of things
at_exit(&Vagrant::Bundler.instance.method(:deinit)) at_exit(&Vagrant::Bundler.instance.method(:deinit))
@ -165,22 +166,14 @@ begin
# 0 - Disables experimental features # 0 - Disables experimental features
# 1 - Enables all features # 1 - Enables all features
# String - Enables one or more features, separated by commas # String - Enables one or more features, separated by commas
if ENV["VAGRANT_EXPERIMENTAL"] if Vagrant::Util::Experimental.enabled?
experimental = ENV["VAGRANT_EXPERIMENTAL"].to_s experimental = Vagrant::Util::Experimental.features_requested
if experimental == "0" ui = Vagrant::UI::Prefixed.new(env.ui, "vagrant")
logger.debug("Experimental flag is set but disabled") logger.debug("Experimental flag is enabled")
if experimental.size >= 1 && experimental.first != "1"
ui.warn(I18n.t("vagrant.general.experimental.features", features: experimental.join(", ")), bold: true, prefix: true, channel: :error)
else else
ui = Vagrant::UI::Prefixed.new(env.ui, "vagrant") ui.warn(I18n.t("vagrant.general.experimental.all"), bold: true, prefix: true, channel: :error)
if experimental != "1"
logger.debug("Experimental flag is enabled")
features = experimental.split(',')
ui.warn(I18n.t("vagrant.general.experimental.features", features: features.join(", ")), bold: true, prefix: true, channel: :error)
elsif experimental == "1"
logger.debug("Experimental flag is enabled")
ui.warn(I18n.t("vagrant.general.experimental.all"), bold: true, prefix: true, channel: :error)
else
logger.warn("Experimental flag is set to an unsupported value")
end
end end
end end